diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 00:53:59 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 00:53:59 +0000 |
| commit | 1ac60480de8f8d3566387a91ecb6ac9b6169ab1f (patch) | |
| tree | 4db53edaf4fa6a430e941398fd587bd56ec3a414 /third_party | |
| parent | 16aef84a15e51aaaf4d1451c80859012a51bb966 (diff) | |
| download | chromium_src-1ac60480de8f8d3566387a91ecb6ac9b6169ab1f.zip chromium_src-1ac60480de8f8d3566387a91ecb6ac9b6169ab1f.tar.gz chromium_src-1ac60480de8f8d3566387a91ecb6ac9b6169ab1f.tar.bz2 | |
Revert 34195 - Make sure the 'use_system_*' variables are actually visible in the relevant gyp files.
BUG=29738
Review URL: http://codereview.chromium.org/479005
TBR=mmoss@google.com
Example choke:
http://build.chromium.org/buildbot/waterfall/builders/Linux%20Perf/builds/4382/steps/compile/logs/stdio
Compiling /b/slave/chromium-rel-linux-hardy/build/src/sconsbuild/Release/obj/chrome/unit_tests/common/bzip2_unittest.o
/b/slave/chromium-rel-linux-hardy/build/src/chrome/common/bzip2_unittest.cc:6:19: error: bzlib.h: No such file or directory
Review URL: http://codereview.chromium.org/484003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/bzip2/bzip2.gyp | 9 | ||||
| -rw-r--r-- | third_party/libjpeg/libjpeg.gyp | 9 | ||||
| -rw-r--r-- | third_party/libpng/libpng.gyp | 9 | ||||
| -rw-r--r-- | third_party/libxslt/libxslt.gyp | 7 | ||||
| -rw-r--r-- | third_party/zlib/zlib.gyp | 9 |
5 files changed, 5 insertions, 38 deletions
diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp index c0f36e0..8bf3b31 100644 --- a/third_party/bzip2/bzip2.gyp +++ b/third_party/bzip2/bzip2.gyp @@ -4,14 +4,7 @@ { 'variables': { - 'conditions': [ - [ 'OS=="linux"', { - # Link to system .so since we already use it due to GTK. - 'use_system_bzip2%': 1, - }, { # OS!="linux" - 'use_system_bzip2%': 0, - }], - ], + 'use_system_bzip2%': 0, }, 'conditions': [ ['use_system_bzip2==0', { diff --git a/third_party/libjpeg/libjpeg.gyp b/third_party/libjpeg/libjpeg.gyp index 1b0798b..c0259d6 100644 --- a/third_party/libjpeg/libjpeg.gyp +++ b/third_party/libjpeg/libjpeg.gyp @@ -4,14 +4,7 @@ { 'variables': { - 'conditions': [ - [ 'OS=="linux"', { - # Link to system .so since we already use it due to GTK. - 'use_system_libjpeg%': 1, - }, { # OS!="linux" - 'use_system_libjpeg%': 0, - }], - ], + 'use_system_libjpeg%': 0, }, 'conditions': [ ['use_system_libjpeg==0', { diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp index 1387b18..6093d5f 100644 --- a/third_party/libpng/libpng.gyp +++ b/third_party/libpng/libpng.gyp @@ -4,14 +4,7 @@ { 'variables': { - 'conditions': [ - [ 'OS=="linux"', { - # Link to system .so since we already use it due to GTK. - 'use_system_libpng%': 1, - }, { # OS!="linux" - 'use_system_libpng%': 0, - }], - ], + 'use_system_libpng%': 0, }, 'conditions': [ ['use_system_libpng==0', { diff --git a/third_party/libxslt/libxslt.gyp b/third_party/libxslt/libxslt.gyp index 4a8f812..1f62810 100644 --- a/third_party/libxslt/libxslt.gyp +++ b/third_party/libxslt/libxslt.gyp @@ -8,13 +8,8 @@ ['OS=="linux" or OS=="freebsd"', {'os_include': 'linux'}], ['OS=="mac"', {'os_include': 'mac'}], ['OS=="win"', {'os_include': 'win32'}], - [ 'OS=="linux"', { - # Link to system .so since we already use it due to GTK. - 'use_system_libxslt%': 1, - }, { # OS!="linux" - 'use_system_libxslt%': 0, - }], ], + 'use_system_libxslt%': 0, }, 'targets': [ { diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp index 36613a7..44e1f8b 100644 --- a/third_party/zlib/zlib.gyp +++ b/third_party/zlib/zlib.gyp @@ -4,14 +4,7 @@ { 'variables': { - 'conditions': [ - [ 'OS=="linux"', { - # Link to system .so since we already use it due to GTK. - 'use_system_zlib%': 1, - }, { # OS!="linux" - 'use_system_zlib%': 0, - }], - ], + 'use_system_zlib%': 0, }, 'conditions': [ ['use_system_zlib==0', { |