diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 22:04:02 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 22:04:02 +0000 |
| commit | 2c6f51d3b6adac62075b3427d2cffdf77718315d (patch) | |
| tree | 642c9218482ce5faa919489187f39757efae0aa1 /third_party/libpng | |
| parent | 7ca1273a8ea05984b1f9dcccba3d19743b087f12 (diff) | |
| download | chromium_src-2c6f51d3b6adac62075b3427d2cffdf77718315d.zip chromium_src-2c6f51d3b6adac62075b3427d2cffdf77718315d.tar.gz chromium_src-2c6f51d3b6adac62075b3427d2cffdf77718315d.tar.bz2 | |
Make sure the 'use_system_*' variables are actually visible in the relevant gyp files.
BUG=29738
Review URL: http://codereview.chromium.org/479005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34195 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libpng')
| -rw-r--r-- | third_party/libpng/libpng.gyp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp index 6093d5f..1387b18 100644 --- a/third_party/libpng/libpng.gyp +++ b/third_party/libpng/libpng.gyp @@ -4,7 +4,14 @@ { 'variables': { - 'use_system_libpng%': 0, + '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, + }], + ], }, 'conditions': [ ['use_system_libpng==0', { |