| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 ], | 136 ], |
| 137 }], | 137 }], |
| 138 ['use_cups==1', { | 138 ['use_cups==1', { |
| 139 'dependencies': [ | 139 'dependencies': [ |
| 140 'cups', | 140 'cups', |
| 141 ], | 141 ], |
| 142 'variables': { | 142 'variables': { |
| 143 'cups_version': '<!(cups-config --api-version)', | 143 'cups_version': '<!(cups-config --api-version)', |
| 144 }, | 144 }, |
| 145 'conditions': [ | 145 'conditions': [ |
| 146 ['OS!="mac"', { | |
| 147 'dependencies': [ | |
| 148 '../build/linux/system.gyp:libgcrypt', | |
| 149 ], | |
| 150 }], | |
| 151 ['cups_version in ["1.6", "1.7"]', { | 146 ['cups_version in ["1.6", "1.7"]', { |
| 152 'cflags': [ | 147 'cflags': [ |
| 153 # CUPS 1.6 deprecated the PPD APIs, but we will stay with this | 148 # CUPS 1.6 deprecated the PPD APIs, but we will stay with this |
| 154 # API for now as supported Linux and Mac OS'es are still using | 149 # API for now as supported Linux and Mac OS'es are still using |
| 155 # older versions of CUPS. More info: crbug.com/226176 | 150 # older versions of CUPS. More info: crbug.com/226176 |
| 156 '-Wno-deprecated-declarations', | 151 '-Wno-deprecated-declarations', |
| 157 # CUPS 1.7 deprecates httpConnectEncrypt(), see the mac section | 152 # CUPS 1.7 deprecates httpConnectEncrypt(), see the mac section |
| 158 # below. | 153 # below. |
| 159 ], | 154 ], |
| 160 }], | 155 }], |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 }, | 309 }, |
| 315 'dependencies': [ | 310 'dependencies': [ |
| 316 '../base/base.gyp:base_java', | 311 '../base/base.gyp:base_java', |
| 317 ], | 312 ], |
| 318 'includes': [ '../build/java.gypi' ], | 313 'includes': [ '../build/java.gypi' ], |
| 319 } | 314 } |
| 320 ] | 315 ] |
| 321 }], | 316 }], |
| 322 ] | 317 ] |
| 323 } | 318 } |
| OLD | NEW |