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

Unified Diff: printing/printing.gyp

Issue 2178073002: Reapply: Fix printing.gyp by joining two 'conditions' dicts together. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2807
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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/printing.gyp
diff --git a/printing/printing.gyp b/printing/printing.gyp
index 3c43ce9837612fb5c7f104257391a36a19ac3b25..80b83c5c5c5f9747dfb42dc4ab84f8f83abd6e86 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -167,13 +167,6 @@
],
},
}],
- ],
- 'defines': [
- # PRINT_BACKEND_AVAILABLE disables the default dummy implementation
- # of the print backend and enables a custom implementation instead.
- 'PRINT_BACKEND_AVAILABLE',
- ],
- 'conditions': [
['chromeos==1', {
'sources': [
'backend/cups_connection.cc',
@@ -195,6 +188,11 @@
],
}],
],
+ 'defines': [
+ # PRINT_BACKEND_AVAILABLE disables the default dummy implementation
+ # of the print backend and enables a custom implementation instead.
+ 'PRINT_BACKEND_AVAILABLE',
+ ],
}],
['OS=="linux" and chromeos==1', {
'defines': [
« 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