Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(683)

Unified Diff: build/common.gypi

Issue 484003: Revert 34195 - Make sure the 'use_system_*' variables are actually visible in... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/install-build-deps.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 34212)
+++ build/common.gypi (working copy)
@@ -44,6 +44,20 @@
# 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',
}],
« no previous file with comments | « no previous file | build/install-build-deps.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698