From 2c6f51d3b6adac62075b3427d2cffdf77718315d Mon Sep 17 00:00:00 2001
From: "mmoss@google.com"
 <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
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
---
 build/common.gypi | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'build/common.gypi')

diff --git a/build/common.gypi b/build/common.gypi
index 0f42c37..ece3401 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -44,20 +44,6 @@
           # hosts should pass an explicit target_arch to gyp.
           'target_arch%':
             '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/arm.*/arm/")',
-
-          # On Linux, we use the system versions of several libraries. We end
-          # up pulling these in as .so's anyway since they are already in our
-          # transitive closure due to GTK.
-          'use_system_zlib': 1,
-          'use_system_libjpeg': 1,
-          'use_system_bzip2': 1,
-          'use_system_libpng': 1,
-          'use_system_libjpeg': 1,
-          'use_system_libxslt': 1,
-
-          # We use our own copy of libssl, although we still need to link
-          # against the rest of NSS.
-          'use_system_ssl': 0,
         }, {  # OS!="linux"
           'target_arch%': 'ia32',
         }],
-- 
cgit v1.1