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

Side by Side Diff: printing/printing.gyp

Issue 2173063002: Fix printing.gyp by joining two 'conditions' dicts together. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 # mac_sdk). 160 # mac_sdk).
161 # With a 10.8 deployment target, several other APIs are 161 # With a 10.8 deployment target, several other APIs are
162 # deprecated. We're still on CUPS 1.4 until Linux no longer 162 # deprecated. We're still on CUPS 1.4 until Linux no longer
163 # needs to support it, see comment above. 163 # needs to support it, see comment above.
164 'xcode_settings': { 164 'xcode_settings': {
165 'WARNING_CFLAGS': [ 165 'WARNING_CFLAGS': [
166 '-Wno-deprecated-declarations', 166 '-Wno-deprecated-declarations',
167 ], 167 ],
168 }, 168 },
169 }], 169 }],
170 ],
171 'defines': [
172 # PRINT_BACKEND_AVAILABLE disables the default dummy implementation
173 # of the print backend and enables a custom implementation instead.
174 'PRINT_BACKEND_AVAILABLE',
175 ],
176
177 'conditions': [
178 ['chromeos==1', { 170 ['chromeos==1', {
179 'sources': [ 171 'sources': [
180 'backend/cups_connection.cc', 172 'backend/cups_connection.cc',
181 'backend/cups_connection.h', 173 'backend/cups_connection.h',
182 'backend/cups_deleter.cc', 174 'backend/cups_deleter.cc',
183 'backend/cups_deleter.h', 175 'backend/cups_deleter.h',
184 'backend/cups_ipp_util.cc', 176 'backend/cups_ipp_util.cc',
185 'backend/cups_ipp_util.h', 177 'backend/cups_ipp_util.h',
186 'backend/cups_printer.cc', 178 'backend/cups_printer.cc',
187 'backend/cups_printer.h', 179 'backend/cups_printer.h',
188 'backend/print_backend_cups_ipp.cc', 180 'backend/print_backend_cups_ipp.cc',
189 'backend/print_backend_cups_ipp.h', 181 'backend/print_backend_cups_ipp.h',
190 ], 182 ],
191 }, { # chromeos==0 183 }, { # chromeos==0
192 'sources': [ 184 'sources': [
193 'backend/cups_helper.cc', 185 'backend/cups_helper.cc',
194 'backend/cups_helper.h', 186 'backend/cups_helper.h',
195 'backend/print_backend_cups.cc', 187 'backend/print_backend_cups.cc',
196 ], 188 ],
197 }], 189 }],
198 ], 190 ],
191 'defines': [
192 # PRINT_BACKEND_AVAILABLE disables the default dummy implementation
193 # of the print backend and enables a custom implementation instead.
194 'PRINT_BACKEND_AVAILABLE',
195 ],
199 }], 196 }],
200 ['OS=="linux" and chromeos==1', { 197 ['OS=="linux" and chromeos==1', {
201 'defines': [ 198 'defines': [
202 # PRINT_BACKEND_AVAILABLE disables the default dummy implementation 199 # PRINT_BACKEND_AVAILABLE disables the default dummy implementation
203 # of the print backend and enables a custom implementation instead. 200 # of the print backend and enables a custom implementation instead.
204 'PRINT_BACKEND_AVAILABLE', 201 'PRINT_BACKEND_AVAILABLE',
205 ], 202 ],
206 'sources': [ 203 'sources': [
207 'backend/print_backend_chromeos.cc', 204 'backend/print_backend_chromeos.cc',
208 ], 205 ],
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 '../build/isolate.gypi', 350 '../build/isolate.gypi',
354 ], 351 ],
355 'sources': [ 352 'sources': [
356 'printing_unittests.isolate', 353 'printing_unittests.isolate',
357 ], 354 ],
358 }, 355 },
359 ], 356 ],
360 }], 357 }],
361 ] 358 ]
362 } 359 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698