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

Side by Side Diff: chrome/chrome.gyp

Issue 4136011: Revert 64441 - Mac cloud print proxy work.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « build/common.gypi ('k') | chrome/service/cloud_print/print_system_cups.cc » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 'sources': [ 1158 'sources': [
1159 'service/cloud_print/print_system_win.cc', 1159 'service/cloud_print/print_system_win.cc',
1160 ], 1160 ],
1161 }], 1161 }],
1162 ['OS=="linux"', { 1162 ['OS=="linux"', {
1163 'dependencies': [ 1163 'dependencies': [
1164 '../build/linux/system.gyp:gtk', 1164 '../build/linux/system.gyp:gtk',
1165 ], 1165 ],
1166 }], 1166 }],
1167 ['use_cups==1', { 1167 ['use_cups==1', {
1168 'link_settings': {
1169 'libraries': [
1170 '-lcups',
1171 '-lgcrypt',
1172 ],
1173 },
1168 'defines': [ 1174 'defines': [
1169 # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation 1175 # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation
1170 # of cloud print system, and allows to use custom implementaiton. 1176 # of cloud print system, and allows to use custom implementaiton.
1171 'CP_PRINT_SYSTEM_AVAILABLE', 1177 'CP_PRINT_SYSTEM_AVAILABLE',
1172 ], 1178 ],
1173 'sources': [ 1179 'sources': [
1174 'service/cloud_print/print_system_cups.cc', 1180 'service/cloud_print/print_system_cups.cc',
1175 ], 1181 ],
1176 'conditions': [
1177 ['OS=="mac"', {
1178 'link_settings': {
1179 'libraries': [
1180 '$(SDKROOT)/usr/lib/libcups.dylib',
1181 ]
1182 },
1183 }, {
1184 'link_settings': {
1185 'libraries': [
1186 '-lcups',
1187 '-lgcrypt',
1188 ],
1189 },
1190 }],
1191 ],
1192 }], 1182 }],
1193 ['remoting==1', { 1183 ['remoting==1', {
1194 'dependencies': [ 1184 'dependencies': [
1195 '../remoting/remoting.gyp:chromoting_base', 1185 '../remoting/remoting.gyp:chromoting_base',
1196 '../remoting/remoting.gyp:chromoting_host', 1186 '../remoting/remoting.gyp:chromoting_host',
1197 '../remoting/remoting.gyp:chromoting_jingle_glue', 1187 '../remoting/remoting.gyp:chromoting_jingle_glue',
1198 ], 1188 ],
1199 }], 1189 }],
1200 ], 1190 ],
1201 }, 1191 },
(...skipping 805 matching lines...) Expand 10 before | Expand all | Expand 10 after
2007 }], # targets 1997 }], # targets
2008 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1998 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
2009 ], # 'conditions' 1999 ], # 'conditions'
2010 } 2000 }
2011 2001
2012 # Local Variables: 2002 # Local Variables:
2013 # tab-width:2 2003 # tab-width:2
2014 # indent-tabs-mode:nil 2004 # indent-tabs-mode:nil
2015 # End: 2005 # End:
2016 # vim: set expandtab tabstop=2 shiftwidth=2: 2006 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/service/cloud_print/print_system_cups.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698