| OLD | NEW |
|---|
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'conditions': [ | 7 'use_system_zlib%': 0, |
| 8 [ 'OS=="linux"', { | |
| 9 # Link to system .so since we already use it due to GTK. | |
| 10 'use_system_zlib%': 1, | |
| 11 }, { # OS!="linux" | |
| 12 'use_system_zlib%': 0, | |
| 13 }], | |
| 14 ], | |
| 15 }, | 8 }, |
| 16 'conditions': [ | 9 'conditions': [ |
| 17 ['use_system_zlib==0', { | 10 ['use_system_zlib==0', { |
| 18 'targets': [ | 11 'targets': [ |
| 19 { | 12 { |
| 20 'target_name': 'zlib', | 13 'target_name': 'zlib', |
| 21 'type': '<(library)', | 14 'type': '<(library)', |
| 22 'msvs_guid': '8423AF0D-4B88-4EBF-94E1-E4D00D00E21C', | 15 'msvs_guid': '8423AF0D-4B88-4EBF-94E1-E4D00D00E21C', |
| 23 'sources': [ | 16 'sources': [ |
| 24 'contrib/minizip/ioapi.c', | 17 'contrib/minizip/ioapi.c', |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 ], | 96 ], |
| 104 }], | 97 }], |
| 105 ], | 98 ], |
| 106 } | 99 } |
| 107 | 100 |
| 108 # Local Variables: | 101 # Local Variables: |
| 109 # tab-width:2 | 102 # tab-width:2 |
| 110 # indent-tabs-mode:nil | 103 # indent-tabs-mode:nil |
| 111 # End: | 104 # End: |
| 112 # vim: set expandtab tabstop=2 shiftwidth=2: | 105 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 484003:
Revert 34195 - Make sure the 'use_system_*' variables are actually visible in... (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/