Chromium Code Reviews| Index: third_party/harfbuzz-ng/BUILD.gn |
| diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn |
| index 4b88d7c47c8d120fb68a4aacb5573b6a3512e486..2d80f407277fb265e66e1e98334f1c9eb6d62e98 100644 |
| --- a/third_party/harfbuzz-ng/BUILD.gn |
| +++ b/third_party/harfbuzz-ng/BUILD.gn |
| @@ -3,6 +3,7 @@ |
| # found in the LICENSE file. |
| import("//build/config/chrome_build.gni") |
| +import("//build/config/features.gni") |
| import("//build/config/linux/pkg_config.gni") |
| import("//build/config/ui.gni") |
| import("//testing/libfuzzer/fuzzer_test.gni") |
| @@ -50,7 +51,8 @@ if (use_system_harfbuzz) { |
| # See also chrome/browser/ui/libgtk2ui/BUILD.gn which pulls this. |
| config("pangoft2_link_hack") { |
| if (is_linux && use_pango && !is_chromeos && !is_official_build && |
| - current_cpu != "arm" && current_cpu != "mipsel" && !is_component_build) { |
| + current_cpu != "arm" && current_cpu != "mipsel" && |
| + !is_component_build && use_glib) { |
|
drott
2016/07/28 07:45:26
Why is use_glib added here? Because pango requires
Mostyn Bramley-Moore
2016/07/28 09:27:14
I added this here because this is dealing with a g
|
| # These symbols are referenced from libpangoft2, which will be |
| # dynamically linked later. |
| ldflags = [ "-Wl,-uhb_ft_face_create_cached,-uhb_glib_get_unicode_funcs" ] |
| @@ -197,10 +199,14 @@ if (use_system_harfbuzz) { |
| deps += [ "//build/linux:freetype2" ] |
| configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] |
| configs += [ "//build/config/gcc:symbol_visibility_default" ] |
| - configs += [ "//build/config/linux:glib" ] |
| sources += [ |
| "src/hb-ft.cc", |
| "src/hb-ft.h", |
| + ] |
| + } |
| + if (use_glib) { |
| + configs += [ "//build/config/linux:glib" ] |
| + sources += [ |
| "src/hb-glib.cc", |
| "src/hb-glib.h", |
| ] |