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

Unified Diff: chrome/chrome.gyp

Issue 1933006: CL for linux proxy for cloud printing (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 10 years, 7 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 | chrome/service/cloud_print/printer_info_cups.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 47158)
+++ chrome/chrome.gyp (working copy)
@@ -998,9 +998,7 @@
'service/cloud_print/cloud_print_proxy_backend.h',
'service/cloud_print/job_status_updater.cc',
'service/cloud_print/job_status_updater.h',
- 'service/cloud_print/printer_info_linux.cc',
- 'service/cloud_print/printer_info_mac.cc',
- 'service/cloud_print/printer_info_win.cc',
+ 'service/cloud_print/printer_info_dummy.cc',
'service/cloud_print/printer_info.h',
'service/cloud_print/printer_job_handler.cc',
'service/cloud_print/printer_job_handler.h',
@@ -1013,11 +1011,36 @@
'..',
],
'conditions': [
+ ['OS=="win"', {
+ 'defines': [
+ # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation
+ # of cloud print system, and allows to use custom implementaiton.
+ 'CP_PRINT_SYSTEM_AVAILABLE',
+ ],
+ 'sources': [
+ 'service/cloud_print/printer_info_win.cc',
+ ],
+ }],
['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:gtk',
],
}],
+ ['OS=="linux" and chromeos==0 and target_arch!="arm"', {
+ 'link_settings': {
+ 'libraries': [
+ '-lcups',
+ ],
+ },
+ 'defines': [
+ # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation
+ # of cloud print system, and allows to use custom implementaiton.
+ 'CP_PRINT_SYSTEM_AVAILABLE',
+ ],
+ 'sources': [
+ 'service/cloud_print/printer_info_cups.cc',
+ ],
+ }],
],
},
],
« no previous file with comments | « no previous file | chrome/service/cloud_print/printer_info_cups.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698