From 2c6f51d3b6adac62075b3427d2cffdf77718315d Mon Sep 17 00:00:00 2001 From: "mmoss@google.com" Date: Wed, 9 Dec 2009 22:04:02 +0000 Subject: 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 --- third_party/libpng/libpng.gyp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'third_party/libpng') 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', { -- cgit v1.1