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

Unified Diff: chrome/chrome.gyp

Issue 6883221: Linux: clean up the usage of "use_cups" gyp switch: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 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: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 82994)
+++ chrome/chrome.gyp (working copy)
@@ -807,6 +807,9 @@
],
}],
['use_cups==1', {
+ 'dependencies': [
+ '../printing/printing.gyp:cups',
+ ],
'defines': [
# CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation
# of cloud print system, and allows to use custom implementaiton.
@@ -815,22 +818,6 @@
'sources': [
'service/cloud_print/print_system_cups.cc',
],
- 'conditions': [
- ['OS=="mac"', {
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/usr/lib/libcups.dylib',
- ]
- },
- }, {
- 'link_settings': {
- 'libraries': [
- '-lcups',
- '-lgcrypt',
- ],
- },
- }],
- ],
}],
['remoting==1', {
'dependencies': [

Powered by Google App Engine
This is Rietveld 408576698