| OLD | NEW | 
|    1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |    1 # Copyright (c) 2011 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     'conditions': [ | 
|    8       [ 'os_posix == 1 and OS != "mac" and OS != "openbsd"', { |    8       [ 'os_posix == 1 and OS != "mac" and OS != "openbsd"', { | 
|    9         # Link to system .so since we already use it due to GTK. |    9         # Link to system .so since we already use it due to GTK. | 
|   10         # TODO(pvalchev): OpenBSD is purposefully left out, as the system |   10         # TODO(pvalchev): OpenBSD is purposefully left out, as the system | 
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   72               ], |   72               ], | 
|   73             }], |   73             }], | 
|   74             ['OS=="mac" or os_bsd==1 or OS=="android"', { |   74             ['OS=="mac" or os_bsd==1 or OS=="android"', { | 
|   75               # Mac, Android and the BSDs don't have fopen64, ftello64, or |   75               # Mac, Android and the BSDs don't have fopen64, ftello64, or | 
|   76               # fseeko64. We use fopen, ftell, and fseek instead on these |   76               # fseeko64. We use fopen, ftell, and fseek instead on these | 
|   77               # systems. |   77               # systems. | 
|   78               'defines': [ |   78               'defines': [ | 
|   79                 'USE_FILE32API' |   79                 'USE_FILE32API' | 
|   80               ], |   80               ], | 
|   81             }], |   81             }], | 
 |   82             ['clang==1', { | 
 |   83               'xcode_settings': { | 
 |   84                 'WARNING_CFLAGS': [ | 
 |   85                   # zlib uses `if ((a == b))` for some reason. | 
 |   86                   '-Wno-parentheses-equality', | 
 |   87                 ], | 
 |   88               }, | 
 |   89               'cflags': [ | 
 |   90                 '-Wno-parentheses-equality', | 
 |   91               ], | 
 |   92             }], | 
|   82           ], |   93           ], | 
|   83         }, |   94         }, | 
|   84       ], |   95       ], | 
|   85     }, { |   96     }, { | 
|   86       'targets': [ |   97       'targets': [ | 
|   87         { |   98         { | 
|   88           'target_name': 'zlib', |   99           'target_name': 'zlib', | 
|   89           'type': 'static_library', |  100           'type': 'static_library', | 
|   90           'direct_dependent_settings': { |  101           'direct_dependent_settings': { | 
|   91             'defines': [ |  102             'defines': [ | 
| (...skipping 27 matching lines...) Expand all  Loading... | 
|  119           'link_settings': { |  130           'link_settings': { | 
|  120             'libraries': [ |  131             'libraries': [ | 
|  121               '-lz', |  132               '-lz', | 
|  122             ], |  133             ], | 
|  123           }, |  134           }, | 
|  124         }, |  135         }, | 
|  125       ], |  136       ], | 
|  126     }], |  137     }], | 
|  127   ], |  138   ], | 
|  128 } |  139 } | 
| OLD | NEW |