Skip to content

Commit 67e2c79

Browse files
committed
Resolve freetype symbols locally (flutter-tizen#85)
* Revert "Revert "Roll FreeType to 2.10.4 (flutter#23666) (flutter#23887)" (flutter-tizen#60)" This reverts commit 582f6fe. * Resolve freetype symbols within the engine binary * Clean up unused build flag
1 parent 5ddb229 commit 67e2c79

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

shell/platform/embedder/BUILD.gn

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,9 @@ shared_library("flutter_engine_library") {
275275

276276
output_name = "flutter_engine"
277277

278+
# For Tizen 5.5 or older. See the script file for details.
279+
ldflags = [ "-Wl,--version-script=" + rebase_path("flutter_engine_exports.lst") ]
280+
278281
if (is_mac && !embedder_for_target) {
279282
ldflags = [ "-Wl,-install_name,@rpath/FlutterEmbedder.framework/$_framework_binary_subpath" ]
280283
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Copyright 2021 Samsung Electronics Co., Ltd. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
# Linker script that hides symbols with the prefix "FT_" so that global freetype
6+
# symbols referenced by Skia are not overriden by an external shared library at
7+
# runtime.
8+
9+
{
10+
global:
11+
*;
12+
local:
13+
FT_*;
14+
};

shell/platform/tizen/config.gni

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
# found in the LICENSE file.
44

55
declare_args() {
6-
# Whether to build the Tizen shell for the host platform, if available.
7-
#
8-
# By default, the Tizen shell is not built if there is a native toolkit shell,
9-
# but it can be enabled for supported platforms (Linux)
10-
# as an extra build artifact with this flag. The native toolkit shell will
11-
# still be built as well.
6+
# Whether to build the Tizen shell.
127
build_tizen_shell = false
13-
tizen_sdk_4 = false
148
}

0 commit comments

Comments
 (0)