| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/linux/pkg_config.gni") | 6 import("//build/config/linux/pkg_config.gni") |
| 7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
| 8 | 8 |
| 9 # The GYP build supports system harfbuzz for non-official builds when using | 9 # The GYP build supports system harfbuzz for non-official builds when using |
| 10 # pangoft2 1.31.0 or greater (which pulls it in). | 10 # pangoft2 1.31.0 or greater (which pulls it in). |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 } | 55 } |
| 56 if (is_win) { | 56 if (is_win) { |
| 57 # Result of 32-bit shift implicitly converted to 64 bits. | 57 # Result of 32-bit shift implicitly converted to 64 bits. |
| 58 cflags += [ "/wd4334" ] | 58 cflags += [ "/wd4334" ] |
| 59 } | 59 } |
| 60 } | 60 } |
| 61 | 61 |
| 62 # See also chrome/browser/ui/libgtk2ui/BUILD.gn which pulls this. | 62 # See also chrome/browser/ui/libgtk2ui/BUILD.gn which pulls this. |
| 63 config("pangoft2_link_hack") { | 63 config("pangoft2_link_hack") { |
| 64 if (is_linux && use_pango && !is_chromeos && !is_official_build && | 64 if (is_linux && use_pango && !is_chromeos && !is_official_build && |
| 65 current_cpu != "arm" && current_cpu != "mipsel" && | 65 current_cpu != "arm" && current_cpu != "mipsel" && !is_component_build)
{ |
| 66 !is_component_build) { | |
| 67 # These symbols are referenced from libpangoft2, which will be | 66 # These symbols are referenced from libpangoft2, which will be |
| 68 # dynamically linked later. | 67 # dynamically linked later. |
| 69 ldflags = | 68 ldflags = [ "-Wl,-uhb_ft_face_create_cached,-uhb_glib_get_unicode_funcs" ] |
| 70 [ "-Wl,-uhb_ft_face_create_cached,-uhb_glib_get_unicode_funcs" ] | |
| 71 } | 69 } |
| 72 } | 70 } |
| 73 | 71 |
| 74 static_library("harfbuzz-ng") { | 72 static_library("harfbuzz-ng") { |
| 75 sources = [ | 73 sources = [ |
| 76 "src/hb-atomic-private.hh", | 74 "src/hb-atomic-private.hh", |
| 77 "src/hb-blob.cc", | 75 "src/hb-blob.cc", |
| 78 "src/hb-blob.h", | 76 "src/hb-blob.h", |
| 79 "src/hb-buffer-deserialize-json.hh", | 77 "src/hb-buffer-deserialize-json.hh", |
| 80 "src/hb-buffer-deserialize-text.hh", | 78 "src/hb-buffer-deserialize-text.hh", |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 "//build/config/linux:freetype2", | 206 "//build/config/linux:freetype2", |
| 209 "//build/config/linux:glib", | 207 "//build/config/linux:glib", |
| 210 ] | 208 ] |
| 211 sources += [ | 209 sources += [ |
| 212 "src/hb-ft.cc", | 210 "src/hb-ft.cc", |
| 213 "src/hb-ft.h", | 211 "src/hb-ft.h", |
| 214 "src/hb-glib.cc", | 212 "src/hb-glib.cc", |
| 215 "src/hb-glib.h", | 213 "src/hb-glib.h", |
| 216 ] | 214 ] |
| 217 } | 215 } |
| 218 | |
| 219 } | 216 } |
| 220 } | 217 } |
| OLD | NEW |