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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/zlib/zlib.gyp

Issue 486012: Make sure the 'use_system_*' variables are actually visible in the relevant gyp files. (Closed)
Patch Set: add new dev dep 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 | « third_party/libpng/libpng.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/zlib.gyp
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index 44e1f8bed22d52c5117ab3a08ea45dcbd85c11d3..36613a735e9927e294d2e6579ec0205018ba0ea0 100644
--- a/third_party/zlib/zlib.gyp
+++ b/third_party/zlib/zlib.gyp
@@ -4,7 +4,14 @@
{
'variables': {
- 'use_system_zlib%': 0,
+ 'conditions': [
+ [ 'OS=="linux"', {
+ # Link to system .so since we already use it due to GTK.
+ 'use_system_zlib%': 1,
+ }, { # OS!="linux"
+ 'use_system_zlib%': 0,
+ }],
+ ],
},
'conditions': [
['use_system_zlib==0', {
« no previous file with comments | « third_party/libpng/libpng.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698