| 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..c5d46ef93c7323cc1a8f9cee769faf6dfb88d7ef 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 && !is_fnl
|
| }
|
|
|
| if (use_system_harfbuzz) {
|
|
|