| Index: third_party/harfbuzz-ng/harfbuzz.gyp
|
| diff --git a/third_party/harfbuzz-ng/harfbuzz.gyp b/third_party/harfbuzz-ng/harfbuzz.gyp
|
| index f381e743f9893966730b5196605ef7e1a29b114e..cd58e641a6f117978d2465065103dd4c6fe2e88b 100644
|
| --- a/third_party/harfbuzz-ng/harfbuzz.gyp
|
| +++ b/third_party/harfbuzz-ng/harfbuzz.gyp
|
| @@ -7,6 +7,18 @@
|
| '../../build/win_precompile.gypi',
|
| ],
|
| 'variables': {
|
| + 'variables': {
|
| + 'conditions': [
|
| + ['sysroot!=""', {
|
| + 'pkg-config': '<(chroot_cmd) ../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"',
|
| + }, {
|
| + 'pkg-config': 'pkg-config'
|
| + }],
|
| + ],
|
| + },
|
| +
|
| + 'pkg-config': '<(pkg-config)',
|
| +
|
| 'conditions': [
|
| ['OS=="linux" and (buildtype!="Official" or chromeos==1) and embedded==0', {
|
| # Since version 1.31.0, pangoft2 which we depend on pulls in harfbuzz
|
| @@ -18,6 +30,12 @@
|
| }, {
|
| 'use_system_harfbuzz': 0,
|
| }],
|
| + ['OS=="linux" and target_arch=="arm" and chromeos==0', {
|
| + # Override use_system_harfbuzz for ARM cross compiling so system
|
| + # harfbuzz is not used because the corresponding package is not
|
| + # available.
|
| + 'use_system_harfbuzz': 0,
|
| + }],
|
| ],
|
| },
|
| 'conditions': [
|
|
|