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 b370348a9fb2e750903ca80d13be406973f16722..5a4376f5dad4075e94b6816eabd81840285d6ff9 100644 |
| --- a/third_party/harfbuzz-ng/BUILD.gn |
| +++ b/third_party/harfbuzz-ng/BUILD.gn |
| @@ -13,20 +13,7 @@ import("//build/config/linux/pkg_config.gni") |
| # don't want to bloat the binary more by including another copy. |
| declare_args() { |
| - # Since version 1.31.0, pangoft2 which we depend on pulls in harfbuzz |
| - # anyways. However, we want to have control of the version of harfbuzz |
| - # we use, so don't use system harfbuzz for official builds, unless we |
| - # are building for chrome os, where we have the system harfbuzz under |
| - # control as well. We also do not want to use the system harfbuzz |
| - # when cross-compiling for ARM. |
| - use_system_harfbuzz = is_linux && (is_chromeos || (!is_official_build && |
| - current_cpu != "arm")) && |
| - exec_script(pkg_config_script, |
| - pkg_config_args + [ |
| - "--atleast-version=1.31.0", |
| - "pangoft2", |
| - ], |
| - "value") |
| + use_system_harfbuzz = is_linux && target_os != "fnl" |
|
jamesr
2015/10/21 00:25:47
we should make an is_fnl as well (the is_linux, et
cdotstout
2015/10/21 00:35:53
There already is.
|
| } |
| if (use_system_harfbuzz) { |