| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index dbfd8243fe7f52f8174d6529da5ac955e2ed5d16..d792a83208b57ab4516aa9965e9cbfe5e3c18ca6 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -151,6 +151,10 @@
|
| 'use_goma%': 0,
|
| 'gomadir%': '',
|
|
|
| + # The system root for cross-compiles. Default: none.
|
| + 'sysroot%': '',
|
| + 'chroot_cmd%': '',
|
| +
|
| 'conditions': [
|
| # Ash needs Aura.
|
| ['use_aura==0', {
|
| @@ -258,6 +262,8 @@
|
| 'buildtype%': '<(buildtype)',
|
| 'branding%': '<(branding)',
|
| 'arm_version%': '<(arm_version)',
|
| + 'sysroot%': '<(sysroot)',
|
| + 'chroot_cmd%': '<(chroot_cmd)',
|
|
|
| # Set to 1 to enable fast builds. Set to 2 for even faster builds
|
| # (it disables debug info for fastest compilation - only for use
|
| @@ -283,10 +289,6 @@
|
| # Detect NEON support at run-time.
|
| 'arm_neon_optional%': 0,
|
|
|
| - # The system root for cross-compiles. Default: none.
|
| - 'sysroot%': '',
|
| - 'chroot_cmd%': '',
|
| -
|
| # The system libdir used for this ABI.
|
| 'system_libdir%': 'lib',
|
|
|
| @@ -297,6 +299,9 @@
|
| # use_libjpeg_turbo is set.
|
| 'use_system_libjpeg%': 0,
|
|
|
| + # Use system libharfbuzz-ng.
|
| + 'use_system_harfbuzz%': 0,
|
| +
|
| # By default, component is set to static_library and it can be overriden
|
| # by the GYP command line or by ~/.gyp/include.gypi.
|
| 'component%': 'static_library',
|
| @@ -737,6 +742,10 @@
|
| ['chromeos==1', {
|
| # When building for ChromeOS we dont want Chromium to use libjpeg_turbo.
|
| 'use_libjpeg_turbo%': 0,
|
| +
|
| + # On ChromeOS, we use the system libharfbuzz-ng, since we use a
|
| + # recent version of libpangoft2 that already includes it.
|
| + 'use_system_harfbuzz%': 1,
|
| }],
|
|
|
| ['OS=="android"', {
|
| @@ -981,6 +990,7 @@
|
| 'wix_path%': '<(wix_path)',
|
| 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
|
| 'use_system_libjpeg%': '<(use_system_libjpeg)',
|
| + 'use_system_harfbuzz%': '<(use_system_harfbuzz)',
|
| 'android_webview_build%': '<(android_webview_build)',
|
| 'icu_use_data_file_flag%': '<(icu_use_data_file_flag)',
|
| 'gyp_managed_install%': 0,
|
| @@ -2979,8 +2989,7 @@
|
| },
|
| },
|
| 'conditions': [
|
| - # TODO(jochen): Enable this on chromeos. http://crbug.com/353127
|
| - ['os_posix==1 and chromeos==0', {
|
| + ['os_posix==1', {
|
| 'target_defaults': {
|
| 'ldflags': [
|
| '-Wl,--fatal-warnings',
|
|
|