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

Unified Diff: printing/printing.gyp

Issue 2105463002: Create a new print backend for the updated CUPS APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix printing gyp file. 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
Index: printing/printing.gyp
diff --git a/printing/printing.gyp b/printing/printing.gyp
index be202cbfdb838df6337f342c91c59be37cda7058..8f43d13e3598d7a8ceabf5fdcbf16708821ffce4 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -72,7 +72,6 @@
'print_settings_initializer_win.h',
'printed_document.cc',
'printed_document.h',
- 'printed_document_linux.cc',
'printed_document_mac.cc',
'printed_document_win.cc',
'printed_page.cc',
@@ -174,10 +173,27 @@
# of the print backend and enables a custom implementation instead.
'PRINT_BACKEND_AVAILABLE',
],
- 'sources': [
- 'backend/cups_helper.cc',
- 'backend/cups_helper.h',
- 'backend/print_backend_cups.cc',
+
+ 'conditions': [
Lei Zhang 2016/07/13 00:34:27 I think the redness means you have tabs, and not s
skau 2016/07/14 20:43:06 Done.
+ ['chromeos==1', {
+ 'sources': [
+ 'backend/cups_connection.cc',
+ 'backend/cups_connection.h',
+ 'backend/cups_ipp_util.cc',
+ 'backend/cups_ipp_util.h',
+ 'backend/cups_printer.cc',
+ 'backend/cups_printer.h',
+ 'backend/print_backend_cups_ipp.cc',
+ 'backend/print_backend_cups_ipp.h',
+ ],
+ }],
Lei Zhang 2016/07/13 00:34:27 GYP can do if-else: ['chromeos==1', { ... }, {
skau 2016/07/14 20:43:06 I didn't see that. Thanks.
+ ['chromeos==0', {
+ 'sources': [
+ 'backend/cups_helper.cc',
+ 'backend/cups_helper.h',
+ 'backend/print_backend_cups.cc',
+ ],
+ }]
],
}],
['OS=="linux" and chromeos==1', {
@@ -194,6 +210,7 @@
'sources': [
'printing_context_linux.cc',
'printing_context_linux.h',
+ 'printed_document_linux.cc',
Lei Zhang 2016/07/13 00:34:27 alphabetical order
skau 2016/07/14 20:43:06 Done.
],
}],
['OS=="android"', {
« printing/backend/print_backend_cups_ipp.cc ('K') | « printing/backend/print_backend_cups_ipp.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698