diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 20:51:31 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 20:51:31 +0000 |
| commit | 30ce6e416a4fc6a4a9eebfe92c5d698072b99d55 (patch) | |
| tree | e75b2bf7afcdd0baba8376200a7dbf9d3da3c092 /third_party | |
| parent | 5f33a97da833172380b8261a1861bc9b862e4b89 (diff) | |
| download | chromium_src-30ce6e416a4fc6a4a9eebfe92c5d698072b99d55.zip chromium_src-30ce6e416a4fc6a4a9eebfe92c5d698072b99d55.tar.gz chromium_src-30ce6e416a4fc6a4a9eebfe92c5d698072b99d55.tar.bz2 | |
Use toolkit_uses_gtk to set use_system_bzip2 in gyp
This let aura build, which doesn't use gtk, to use third_party/bzip2
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9369054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/bzip2/bzip2.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp index 10f2d34..322eae0 100644 --- a/third_party/bzip2/bzip2.gyp +++ b/third_party/bzip2/bzip2.gyp @@ -5,10 +5,10 @@ { 'variables': { 'conditions': [ - [ 'os_posix == 1 and OS != "mac" and OS != "android"', { + [ 'toolkit_uses_gtk==1', { # Link to system .so since we already use it due to GTK. 'use_system_bzip2%': 1, - }, { # os_posix != 1 or OS == "mac" or OS == "android" + }, { # toolkit_uses_gtk!=1 'use_system_bzip2%': 0, }], ], |