Resolve freetype symbols locally

DEPS

@@ -21,6 +21,7 @@ vars = {
   'chromium_git': 'https://chromium.googlesource.com',
   'swiftshader_git': 'https://swiftshader.googlesource.com',
   'dart_git': 'https://dart.googlesource.com',
+  'flutter_git': 'https://flutter.googlesource.com',
   'fuchsia_git': 'https://fuchsia.googlesource.com',
   'github_git': 'https://github.com',
   'skia_git': 'https://skia.googlesource.com',
@@ -92,6 +93,7 @@ gclient_gn_args = [
 # If you need to add a new host, contact chrome infrastructure team.
 allowed_hosts = [
   'chromium.googlesource.com',
+  'flutter.googlesource.com',
   'fuchsia.googlesource.com',
   'github.com',
   'skia.googlesource.com',
@@ -350,7 +352,7 @@ deps = {
    Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
 
   'src/third_party/freetype2':
-   Var('fuchsia_git') + '/third_party/freetype2' + '@' + 'edab12c07ac05d1185616688f338b1ad15936796',
+   Var('flutter_git') + '/third_party/freetype2' + '@' + '1f03c1b2d7f2ae832a4fbe9d12bd96c3c15bbece',
 
   'src/third_party/root_certificates':
    Var('dart_git') + '/root_certificates.git' + '@' + Var('dart_root_certificates_rev'),

ci/licenses_golden/tool_signature

@@ -1,2 +1,2 @@
-Signature: 164585dad7317491c0f98b96519f87c7
+Signature: b8646e680ea27ee6e0e97676ebbe5975
 

shell/platform/embedder/BUILD.gn

@@ -266,6 +266,9 @@ shared_library("flutter_engine_library") {
 
   output_name = "flutter_engine"
 
+  # For Tizen 5.5 or older. See the script file for details.
+  ldflags = [ "-Wl,--version-script=" + rebase_path("flutter_engine_exports.lst") ]
+
   if (is_mac && !embedder_for_target) {
     ldflags = [ "-Wl,-install_name,@rpath/FlutterEmbedder.framework/$_framework_binary_subpath" ]
   }

shell/platform/embedder/flutter_engine_exports.lst

@@ -0,0 +1,14 @@
+# Copyright 2021 Samsung Electronics Co., Ltd. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Linker script that hides symbols with the prefix "FT_" so that global freetype
+# symbols referenced by Skia are not overriden by an external shared library at
+# runtime.
+
+{
+  global:
+    *;
+  local:
+    FT_*;
+};

shell/platform/tizen/config.gni

@@ -3,12 +3,6 @@
 # found in the LICENSE file.
 
 declare_args() {
-  # Whether to build the Tizen shell for the host platform, if available.
-  #
-  # By default, the Tizen shell is not built if there is a native toolkit shell,
-  # but it can be enabled for supported platforms (Linux)
-  # as an extra build artifact with this flag. The native toolkit shell will
-  # still be built as well.
+  # Whether to build the Tizen shell.
   build_tizen_shell = false
-  tizen_sdk_4 = false
 }

tools/licenses/lib/patterns.dart

@@ -85,6 +85,7 @@ final List<RegExp> copyrightStatementPatterns = <RegExp>[
   RegExp(r'^ *For more info read ([^ ]+)$', caseSensitive: false),
   RegExp(r'^(?:Google )?Author\(?s?\)?: .+', caseSensitive: false),
   RegExp(r'^Written by .+', caseSensitive: false),
+  RegExp(r'^Originally written by .+', caseSensitive: false),
   RegExp(r'^Based on$', caseSensitive: false),
   RegExp(r"^based on (?:code in )?['`][^'`]+['`]$", caseSensitive: false),
   RegExp(r'^Based on .+, written by .+, [0-9]+\.$', caseSensitive: false),