diff options
| author | sbc <sbc@chromium.org> | 2015-06-03 19:13:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-04 02:13:47 +0000 |
| commit | 3f39737a0258d942440b9abe589f06c7305bfb77 (patch) | |
| tree | f8ef279ae8b50ae5e7f1465d19f66c81630b0ab8 /third_party | |
| parent | c9febe9f2462a1bd2b2fd5188fd05c88c552220b (diff) | |
| download | chromium_src-3f39737a0258d942440b9abe589f06c7305bfb77.zip chromium_src-3f39737a0258d942440b9abe589f06c7305bfb77.tar.gz chromium_src-3f39737a0258d942440b9abe589f06c7305bfb77.tar.bz2 | |
Speculative revert to fix ChromeOS PFQ mips builder
The original change is suspected of breaking the build
and the second one is followup that needs to be reverted
along with it.
Revert "Fix use of 'sysroot' variable in harfbuzz.gyp"
https://codereview.chromium.org/1158283003
Revert "Fix common.gypi when run with target_arch=mips"
https://codereview.chromium.org/1166523004
TBR=cpu
BUG=496462
Review URL: https://codereview.chromium.org/1159083004
Cr-Commit-Position: refs/heads/master@{#332766}
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/harfbuzz-ng/harfbuzz.gyp | 18 | ||||
| -rw-r--r-- | third_party/libexif/libexif.gyp | 11 |
2 files changed, 29 insertions, 0 deletions
diff --git a/third_party/harfbuzz-ng/harfbuzz.gyp b/third_party/harfbuzz-ng/harfbuzz.gyp index f381e74..cd58e64 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': [ diff --git a/third_party/libexif/libexif.gyp b/third_party/libexif/libexif.gyp index 2ef3c2b..2d8b242 100644 --- a/third_party/libexif/libexif.gyp +++ b/third_party/libexif/libexif.gyp @@ -114,6 +114,17 @@ }, ], }, { # 'use_system_libexif!=0 + 'conditions': [ + ['sysroot!=""', { + 'variables': { + 'pkg-config': '../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"', + }, + }, { + 'variables': { + 'pkg-config': 'pkg-config' + }, + }], + ], 'targets': [ { 'target_name': 'libexif', |