Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index dbfd8243fe7f52f8174d6529da5ac955e2ed5d16..3f9c4335410fb88fcadf7326da95a3fc844eb524 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -297,6 +297,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 +740,9 @@ |
| ['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. |
|
Nico
2014/03/18 15:12:13
Probably better to answer "why?" than "what?" here
jochen (gone - plz use gerrit)
2014/03/18 15:39:37
Done.
|
| + 'use_system_harfbuzz%': 1, |
| }], |
| ['OS=="android"', { |
| @@ -981,6 +987,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 +2986,7 @@ |
| }, |
| }, |
| 'conditions': [ |
| - # TODO(jochen): Enable this on chromeos. http://crbug.com/353127 |
| - ['os_posix==1 and chromeos==0', { |
|
Nico
2014/03/18 15:12:13
Mention that you're also turning on linker-warning
jochen (gone - plz use gerrit)
2014/03/18 15:39:37
Done.
|
| + ['os_posix==1', { |
| 'target_defaults': { |
| 'ldflags': [ |
| '-Wl,--fatal-warnings', |