summaryrefslogtreecommitdiffstats
path: root/third_party/libpng/libpng.gyp
diff options
context:
space:
mode:
authorjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 00:53:59 +0000
committerjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-10 00:53:59 +0000
commit1ac60480de8f8d3566387a91ecb6ac9b6169ab1f (patch)
tree4db53edaf4fa6a430e941398fd587bd56ec3a414 /third_party/libpng/libpng.gyp
parent16aef84a15e51aaaf4d1451c80859012a51bb966 (diff)
downloadchromium_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/libpng/libpng.gyp')
-rw-r--r--third_party/libpng/libpng.gyp9
1 files changed, 1 insertions, 8 deletions
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', {