Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1489)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/harfbuzz-ng/BUILD.gn

Issue 1783443003: Build HarfBuzz as loadable module when chromeos=1 under Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/platform/BUILD.gn ('k') | third_party/harfbuzz-ng/harfbuzz.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/harfbuzz-ng/BUILD.gn
diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
index 4824a4f864bfcb16e24cc7571d7bbef7be739726..2be4af44a93e444ddbe87adfc537877764ef9bc9 100644
--- a/third_party/harfbuzz-ng/BUILD.gn
+++ b/third_party/harfbuzz-ng/BUILD.gn
@@ -5,6 +5,7 @@
import("//build/config/chrome_build.gni")
import("//build/config/linux/pkg_config.gni")
import("//build/config/ui.gni")
+import("//third_party/harfbuzz-ng/harfbuzz.gni")
# The GYP build supports system harfbuzz for non-official builds when using
# pangoft2 1.31.0 or greater (which pulls it in).
@@ -19,13 +20,13 @@ declare_args() {
# anyways. However, we want to have control of the version of harfbuzz
# we use, so don't use system harfbuzz unless we are building for
# chrome os, where we have the system harfbuzz under control.
- use_system_harfbuzz =
- is_linux && is_chromeos && exec_script(pkg_config_script,
- pkg_config_args + [
- "--atleast-version=1.31.0",
- "pangoft2",
- ],
- "value")
+ use_system_harfbuzz = false
+ # is_linux && is_chromeos && exec_script(pkg_config_script,
+ # pkg_config_args + [
+ # "--atleast-version=1.31.0",
+ # "pangoft2",
+ # ],
+ # "value")
}
if (use_system_harfbuzz) {
@@ -69,147 +70,81 @@ if (use_system_harfbuzz) {
}
}
- static_library("harfbuzz-ng") {
- sources = [
- "src/hb-atomic-private.hh",
- "src/hb-blob.cc",
- "src/hb-blob.h",
- "src/hb-buffer-deserialize-json.hh",
- "src/hb-buffer-deserialize-text.hh",
- "src/hb-buffer-private.hh",
- "src/hb-buffer-serialize.cc",
- "src/hb-buffer.cc",
- "src/hb-buffer.h",
- "src/hb-cache-private.hh",
- "src/hb-common.cc",
- "src/hb-common.h",
- "src/hb-deprecated.h",
- "src/hb-face-private.hh",
- "src/hb-face.cc",
- "src/hb-face.h",
- "src/hb-fallback-shape.cc",
- "src/hb-font-private.hh",
- "src/hb-font.cc",
- "src/hb-font.h",
- "src/hb-icu.cc",
- "src/hb-icu.h",
- "src/hb-mutex-private.hh",
- "src/hb-object-private.hh",
- "src/hb-open-file-private.hh",
- "src/hb-open-type-private.hh",
- "src/hb-ot-font.cc",
- "src/hb-ot-font.h",
- "src/hb-ot-head-table.hh",
- "src/hb-ot-hhea-table.hh",
- "src/hb-ot-hmtx-table.hh",
- "src/hb-ot-layout-common-private.hh",
- "src/hb-ot-layout-gdef-table.hh",
- "src/hb-ot-layout-gpos-table.hh",
- "src/hb-ot-layout-gsub-table.hh",
- "src/hb-ot-layout-gsubgpos-private.hh",
- "src/hb-ot-layout-private.hh",
- "src/hb-ot-layout.cc",
- "src/hb-ot-layout.h",
- "src/hb-ot-map-private.hh",
- "src/hb-ot-map.cc",
- "src/hb-ot-maxp-table.hh",
- "src/hb-ot-name-table.hh",
- "src/hb-ot-shape-complex-arabic-fallback.hh",
- "src/hb-ot-shape-complex-arabic-private.hh",
- "src/hb-ot-shape-complex-arabic-table.hh",
- "src/hb-ot-shape-complex-arabic.cc",
- "src/hb-ot-shape-complex-default.cc",
- "src/hb-ot-shape-complex-hangul.cc",
- "src/hb-ot-shape-complex-hebrew.cc",
- "src/hb-ot-shape-complex-indic-machine.hh",
- "src/hb-ot-shape-complex-indic-private.hh",
- "src/hb-ot-shape-complex-indic-table.cc",
- "src/hb-ot-shape-complex-indic.cc",
- "src/hb-ot-shape-complex-myanmar-machine.hh",
- "src/hb-ot-shape-complex-myanmar.cc",
- "src/hb-ot-shape-complex-private.hh",
- "src/hb-ot-shape-complex-thai.cc",
- "src/hb-ot-shape-complex-tibetan.cc",
- "src/hb-ot-shape-complex-use-machine.hh",
- "src/hb-ot-shape-complex-use-private.hh",
- "src/hb-ot-shape-complex-use-table.cc",
- "src/hb-ot-shape-complex-use.cc",
- "src/hb-ot-shape-fallback-private.hh",
- "src/hb-ot-shape-fallback.cc",
- "src/hb-ot-shape-normalize-private.hh",
- "src/hb-ot-shape-normalize.cc",
- "src/hb-ot-shape-private.hh",
- "src/hb-ot-shape.cc",
- "src/hb-ot-shape.h",
- "src/hb-ot-tag.cc",
- "src/hb-ot-tag.h",
- "src/hb-ot.h",
- "src/hb-private.hh",
- "src/hb-set-private.hh",
- "src/hb-set.cc",
- "src/hb-set.h",
- "src/hb-shape-plan-private.hh",
- "src/hb-shape-plan.cc",
- "src/hb-shape-plan.h",
- "src/hb-shape.cc",
- "src/hb-shape.h",
- "src/hb-shaper-impl-private.hh",
- "src/hb-shaper-list.hh",
- "src/hb-shaper-private.hh",
- "src/hb-shaper.cc",
- "src/hb-unicode-private.hh",
- "src/hb-unicode.cc",
- "src/hb-unicode.h",
- "src/hb-utf-private.hh",
- "src/hb-version.h",
- "src/hb-warning.cc",
- "src/hb.h",
- ]
-
- defines = [
- "HAVE_OT",
- "HAVE_ICU",
- "HAVE_ICU_BUILTIN",
- "HB_NO_MT",
- ]
-
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [
- "//build/config/compiler:no_chromium_code",
-
- # Must be after no_chromium_code for warning flags to be ordered
- # correctly.
- ":harfbuzz_warnings",
- ]
- public_configs = [ ":harfbuzz-ng_config" ]
-
- deps = [
- "//third_party/icu:icuuc",
- ]
-
- if (is_mac) {
- sources += [
- "src/hb-coretext.cc",
- "src/hb-coretext.h",
+ harfbuzz_defines = [
+ "HAVE_OT",
+ "HAVE_ICU",
+ "HAVE_ICU_BUILTIN",
+ "HB_NO_MT",
+ ]
+
+ if (is_linux && is_chromeos) {
+ loadable_module("harfbuzz-ng") {
+ output_name = "harfbuzz"
+ output_extension = "so"
+
+ sources = harfbuzz_files
+
+ defines = harfbuzz_defines
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [
+ "//build/config/compiler:no_chromium_code",
+
+ # Must be after no_chromium_code for warning flags to be ordered
+ # correctly.
+ ":harfbuzz_warnings",
+ ]
+
+ public_configs = [ ":harfbuzz-ng_config" ]
+
+ deps = [
+ "//third_party/icu:icuuc",
]
- defines += [ "HAVE_CORETEXT" ]
}
+ } else {
+ static_library("harfbuzz-ng") {
+ sources = harfbuzz_files
- # When without -fvisibility=hidden for pango to use the harfbuzz
- # in the tree, all symbols pango needs must be included, or
- # pango uses mixed versions of harfbuzz and leads to crash.
- # See crbug.com/462689.
- if (is_linux && use_pango && !is_chromeos && !is_official_build &&
- current_cpu != "arm" && current_cpu != "mipsel") {
- deps += [ "//build/linux:freetype2" ]
- configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
- configs += [ "//build/config/linux:glib" ]
- sources += [
- "src/hb-ft.cc",
- "src/hb-ft.h",
- "src/hb-glib.cc",
- "src/hb-glib.h",
+ defines = harfbuzz_defines
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [
+ "//build/config/compiler:no_chromium_code",
+
+ # Must be after no_chromium_code for warning flags to be ordered
+ # correctly.
+ ":harfbuzz_warnings",
]
+ public_configs = [ ":harfbuzz-ng_config" ]
+
+ deps = [
+ "//third_party/icu:icuuc",
+ ]
+
+ if (is_mac) {
+ sources += [
+ "src/hb-coretext.cc",
+ "src/hb-coretext.h",
+ ]
+ defines += [ "HAVE_CORETEXT" ]
+ }
+
+ # When without -fvisibility=hidden for pango to use the harfbuzz
+ # in the tree, all symbols pango needs must be included, or
+ # pango uses mixed versions of harfbuzz and leads to crash.
+ # See crbug.com/462689.
+ if (is_linux && use_pango && !is_chromeos && !is_official_build &&
+ current_cpu != "arm" && current_cpu != "mipsel") {
+ deps += [ "//build/linux:freetype2" ]
+ configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
+ configs += [ "//build/config/linux:glib" ]
+ sources += [
+ "src/hb-ft.cc",
+ "src/hb-ft.h",
+ "src/hb-glib.cc",
+ "src/hb-glib.h",
+ ]
+ }
}
}
}
« no previous file with comments | « third_party/WebKit/Source/platform/BUILD.gn ('k') | third_party/harfbuzz-ng/harfbuzz.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698