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

Side by Side Diff: build/common.gypi

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 | « no previous file | chrome/browser/resources/options/advanced_options.html » ('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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 # Variable 'component' is for cases where we would like to build some 112 # Variable 'component' is for cases where we would like to build some
113 # components as dynamic shared libraries but still need variable 113 # components as dynamic shared libraries but still need variable
114 # 'library' for static libraries. 114 # 'library' for static libraries.
115 # By default, component is set to whatever library is set to and 115 # By default, component is set to whatever library is set to and
116 # it can be overriden by the GYP command line or by ~/.gyp/include.gypi. 116 # it can be overriden by the GYP command line or by ~/.gyp/include.gypi.
117 'component%': '<(library)', 117 'component%': '<(library)',
118 118
119 # Set to select the Title Case versions of strings in GRD files. 119 # Set to select the Title Case versions of strings in GRD files.
120 'use_titlecase_in_grd_files%': 0, 120 'use_titlecase_in_grd_files%': 0,
121 121
122 # Remoting compilation is enabled by default. Set to 0 to disable.
123 'remoting%': 1,
124
122 'conditions': [ 125 'conditions': [
123 # A flag to enable or disable our compile-time dependency 126 # A flag to enable or disable our compile-time dependency
124 # on gnome-keyring. If that dependency is disabled, no gnome-keyring 127 # on gnome-keyring. If that dependency is disabled, no gnome-keyring
125 # support will be available. This option is useful 128 # support will be available. This option is useful
126 # for Linux distributions. 129 # for Linux distributions.
127 ['chromeos==1', { 130 ['chromeos==1', {
128 'use_gnome_keyring%': 0, 131 'use_gnome_keyring%': 0,
129 }, { 132 }, {
130 'use_gnome_keyring%': 1, 133 'use_gnome_keyring%': 1,
131 }], 134 }],
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 'inside_chromium_build%': '<(inside_chromium_build)', 169 'inside_chromium_build%': '<(inside_chromium_build)',
167 'fastbuild%': '<(fastbuild)', 170 'fastbuild%': '<(fastbuild)',
168 'python_ver%': '<(python_ver)', 171 'python_ver%': '<(python_ver)',
169 'armv7%': '<(armv7)', 172 'armv7%': '<(armv7)',
170 'arm_neon%': '<(arm_neon)', 173 'arm_neon%': '<(arm_neon)',
171 'sysroot%': '<(sysroot)', 174 'sysroot%': '<(sysroot)',
172 'disable_sse2%': '<(disable_sse2)', 175 'disable_sse2%': '<(disable_sse2)',
173 'library%': '<(library)', 176 'library%': '<(library)',
174 'component%': '<(component)', 177 'component%': '<(component)',
175 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)', 178 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)',
179 'remoting%': '<(remoting)',
176 180
177 # The release channel that this build targets. This is used to restrict 181 # The release channel that this build targets. This is used to restrict
178 # channel-specific build options, like which installer packages to create. 182 # channel-specific build options, like which installer packages to create.
179 # The default is 'all', which does no channel-specific filtering. 183 # The default is 'all', which does no channel-specific filtering.
180 'channel%': 'all', 184 'channel%': 'all',
181 185
182 # Override chromium_mac_pch and set it to 0 to suppress the use of 186 # Override chromium_mac_pch and set it to 0 to suppress the use of
183 # precompiled headers on the Mac. Prefix header injection may still be 187 # precompiled headers on the Mac. Prefix header injection may still be
184 # used, but prefix headers will not be precompiled. This is useful when 188 # used, but prefix headers will not be precompiled. This is useful when
185 # using distcc to distribute a build to compile slaves that don't 189 # using distcc to distribute a build to compile slaves that don't
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 'chromium_code%': 0, 330 'chromium_code%': 0,
327 331
328 # Set to 1 to compile with the built in pdf viewer. 332 # Set to 1 to compile with the built in pdf viewer.
329 'internal_pdf%': 0, 333 'internal_pdf%': 0,
330 334
331 # This allows to use libcros from the current system, ie. /usr/lib/ 335 # This allows to use libcros from the current system, ie. /usr/lib/
332 # The cros_api will be pulled in as a static library, and all headers 336 # The cros_api will be pulled in as a static library, and all headers
333 # from the system include dirs. 337 # from the system include dirs.
334 'system_libcros%': 0, 338 'system_libcros%': 0,
335 339
336 # Remoting compilation is enabled by default. Set to 0 to disable.
337 'remoting%': 1,
338
339 # NOTE: When these end up in the Mac bundle, we need to replace '-' for '_' 340 # NOTE: When these end up in the Mac bundle, we need to replace '-' for '_'
340 # so Cocoa is happy (http://crbug.com/20441). 341 # so Cocoa is happy (http://crbug.com/20441).
341 'locales': [ 342 'locales': [
342 'am', 'ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 343 'am', 'ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB',
343 'en-US', 'es-419', 'es', 'et', 'fa', 'fi', 'fil', 'fr', 'gu', 'he', 344 'en-US', 'es-419', 'es', 'et', 'fa', 'fi', 'fil', 'fr', 'gu', 'he',
344 'hi', 'hr', 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv', 345 'hi', 'hr', 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv',
345 'ml', 'mr', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 346 'ml', 'mr', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru',
346 'sk', 'sl', 'sr', 'sv', 'sw', 'ta', 'te', 'th', 'tr', 'uk', 347 'sk', 'sl', 'sr', 'sv', 'sw', 'ta', 'te', 'th', 'tr', 'uk',
347 'vi', 'zh-CN', 'zh-TW', 348 'vi', 'zh-CN', 'zh-TW',
348 ], 349 ],
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 # Setup -D flags passed into grit. 443 # Setup -D flags passed into grit.
443 ['chromeos==1', { 444 ['chromeos==1', {
444 'grit_defines': ['-D', 'chromeos'], 445 'grit_defines': ['-D', 'chromeos'],
445 }], 446 }],
446 ['toolkit_views==1', { 447 ['toolkit_views==1', {
447 'grit_defines': ['-D', 'toolkit_views'], 448 'grit_defines': ['-D', 'toolkit_views'],
448 }], 449 }],
449 ['touchui==1', { 450 ['touchui==1', {
450 'grit_defines': ['-D', 'touchui'], 451 'grit_defines': ['-D', 'touchui'],
451 }], 452 }],
453 ['remoting==1', {
454 'grit_defines': ['-D', 'remoting'],
455 }],
452 ['use_titlecase_in_grd_files==1', { 456 ['use_titlecase_in_grd_files==1', {
453 'grit_defines': ['-D', 'use_titlecase'], 457 'grit_defines': ['-D', 'use_titlecase'],
454 }], 458 }],
455 ], 459 ],
456 }, 460 },
457 'target_defaults': { 461 'target_defaults': {
458 'variables': { 462 'variables': {
459 # The condition that operates on chromium_code is in a target_conditions 463 # The condition that operates on chromium_code is in a target_conditions
460 # section, and will not have access to the default fallback value of 464 # section, and will not have access to the default fallback value of
461 # chromium_code at the top of this file, or to the chromium_code 465 # chromium_code at the top of this file, or to the chromium_code
(...skipping 1039 matching lines...) Expand 10 before | Expand all | Expand 10 after
1501 # and therefore SYMROOT, needs to be set at the project level. 1505 # and therefore SYMROOT, needs to be set at the project level.
1502 'SYMROOT': '<(DEPTH)/xcodebuild', 1506 'SYMROOT': '<(DEPTH)/xcodebuild',
1503 }, 1507 },
1504 } 1508 }
1505 1509
1506 # Local Variables: 1510 # Local Variables:
1507 # tab-width:2 1511 # tab-width:2
1508 # indent-tabs-mode:nil 1512 # indent-tabs-mode:nil
1509 # End: 1513 # End:
1510 # vim: set expandtab tabstop=2 shiftwidth=2: 1514 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/options/advanced_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698