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

Side by Side Diff: chrome/chrome.gyp

Issue 6174005: Fix compilation with disabled remoting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 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 | « chrome/browser/resources/options/advanced_options.html ('k') | no next file » | 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 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1163 'libraries': [ 1163 'libraries': [
1164 '-lcups', 1164 '-lcups',
1165 '-lgcrypt', 1165 '-lgcrypt',
1166 ], 1166 ],
1167 }, 1167 },
1168 }], 1168 }],
1169 ], 1169 ],
1170 }], 1170 }],
1171 ['remoting==1', { 1171 ['remoting==1', {
1172 'dependencies': [ 1172 'dependencies': [
1173 '../remoting/remoting.gyp:chromoting_base',
1174 '../remoting/remoting.gyp:chromoting_host', 1173 '../remoting/remoting.gyp:chromoting_host',
1175 '../remoting/remoting.gyp:chromoting_jingle_glue', 1174 ],
1175 }],
1176 ['remoting==0', {
1177 'sources!': [
1178 'service/remoting/chromoting_host_manager.cc',
1179 'service/remoting/chromoting_host_manager.h',
1176 ], 1180 ],
1177 }], 1181 }],
1178 ], 1182 ],
1179 }, 1183 },
1180 ], 1184 ],
1181 'conditions': [ 1185 'conditions': [
1182 ['OS=="mac"', 1186 ['OS=="mac"',
1183 { 'targets': [ 1187 { 'targets': [
1184 { 1188 {
1185 'target_name': 'helper_app', 1189 'target_name': 'helper_app',
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
1894 }], # targets 1898 }], # targets
1895 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1899 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1896 ], # 'conditions' 1900 ], # 'conditions'
1897 } 1901 }
1898 1902
1899 # Local Variables: 1903 # Local Variables:
1900 # tab-width:2 1904 # tab-width:2
1901 # indent-tabs-mode:nil 1905 # indent-tabs-mode:nil
1902 # End: 1906 # End:
1903 # vim: set expandtab tabstop=2 shiftwidth=2: 1907 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/advanced_options.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698