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

Side by Side Diff: chrome/chrome.gyp

Issue 3945003: Move useful printing backend code from chrome/service/cloud_print to printing... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: resolve merge conflict Created 10 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/common.gypi ('k') | chrome/service/cloud_print/cloud_print_consts.h » ('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 1130 matching lines...) Expand 10 before | Expand all | Expand 10 after
1141 'service/gaia/service_gaia_authenticator.cc', 1141 'service/gaia/service_gaia_authenticator.cc',
1142 'service/gaia/service_gaia_authenticator.h', 1142 'service/gaia/service_gaia_authenticator.h',
1143 'service/net/service_url_request_context.cc', 1143 'service/net/service_url_request_context.cc',
1144 'service/net/service_url_request_context.h', 1144 'service/net/service_url_request_context.h',
1145 'service/remoting/remoting_directory_service.cc', 1145 'service/remoting/remoting_directory_service.cc',
1146 'service/remoting/remoting_directory_service.h', 1146 'service/remoting/remoting_directory_service.h',
1147 ], 1147 ],
1148 'include_dirs': [ 1148 'include_dirs': [
1149 '..', 1149 '..',
1150 ], 1150 ],
1151 'variables': {
1152 'conditions': [
1153 ['OS=="linux" and chromeos==0 and target_arch!="arm"', {
1154 'use_cups%': 1,
1155 }, {
1156 'use_cups%': 0,
1157 }],
1158 ],
1159 },
1160 'conditions': [ 1151 'conditions': [
1161 ['OS=="win"', { 1152 ['OS=="win"', {
1162 'defines': [ 1153 'defines': [
1163 # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation 1154 # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation
1164 # of cloud print system, and allows to use custom implementaiton. 1155 # of cloud print system, and allows to use custom implementaiton.
1165 'CP_PRINT_SYSTEM_AVAILABLE', 1156 'CP_PRINT_SYSTEM_AVAILABLE',
1166 ], 1157 ],
1167 'sources': [ 1158 'sources': [
1168 'service/cloud_print/print_system_win.cc', 1159 'service/cloud_print/print_system_win.cc',
1169 ], 1160 ],
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
2045 }], # targets 2036 }], # targets
2046 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 2037 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
2047 ], # 'conditions' 2038 ], # 'conditions'
2048 } 2039 }
2049 2040
2050 # Local Variables: 2041 # Local Variables:
2051 # tab-width:2 2042 # tab-width:2
2052 # indent-tabs-mode:nil 2043 # indent-tabs-mode:nil
2053 # End: 2044 # End:
2054 # vim: set expandtab tabstop=2 shiftwidth=2: 2045 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/service/cloud_print/cloud_print_consts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698