diff options
| author | sbc <sbc@chromium.org> | 2015-06-04 18:13:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-05 01:14:15 +0000 |
| commit | dea1c634b5328b1e171ba22698fb7027f338453f (patch) | |
| tree | 7125d335e25f7465d03cd7f9f1bae2320f125f16 /third_party | |
| parent | ee1c33052a4798e046ed134a0ec3fe61fdbf9d41 (diff) | |
| download | chromium_src-dea1c634b5328b1e171ba22698fb7027f338453f.zip chromium_src-dea1c634b5328b1e171ba22698fb7027f338453f.tar.gz chromium_src-dea1c634b5328b1e171ba22698fb7027f338453f.tar.bz2 | |
Fix use of 'sysroot' variable in harfbuzz.gyp
The sysroot variable is set conditionally in common.gypi
but not at the nesting level required for other conditional
to depend on it like the one in hardbuzz does. This means
that sysroot always appeared to be empty to harfbuzz.gyp,
and hence the special handling for ARM linux was required.
This change moves the setting of 'sysroot' up one level of
nesting and defines 'pkg-config' in common.gypi so it can
be shared.
This is the third attempt at a landing. First attempt was
reverted: https://codereview.chromium.org/1151753002
This is a re-land of the second attempt which was
reverted speculatively (wrongly as it turned out):
https://codereview.chromium.org/1158283003
TBR=cpu
Review URL: https://codereview.chromium.org/1146303007
Cr-Commit-Position: refs/heads/master@{#332982}
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, 0 insertions, 29 deletions
diff --git a/third_party/harfbuzz-ng/harfbuzz.gyp b/third_party/harfbuzz-ng/harfbuzz.gyp index cd58e64..f381e74 100644 --- a/third_party/harfbuzz-ng/harfbuzz.gyp +++ b/third_party/harfbuzz-ng/harfbuzz.gyp @@ -7,18 +7,6 @@ '../../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 @@ -30,12 +18,6 @@ }, { '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 2d8b242..2ef3c2b 100644 --- a/third_party/libexif/libexif.gyp +++ b/third_party/libexif/libexif.gyp @@ -114,17 +114,6 @@ }, ], }, { # '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', |