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

Side by Side Diff: build/common.gypi

Issue 2788003: Enable chromoting in the build by default (Closed)
Patch Set: fixed mac Created 10 years, 6 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
« no previous file with comments | « no previous file | remoting/chromoting.gyp » ('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': { 9 'variables': {
10 # .gyp files or targets should set chromium_code to 1 if they build 10 # .gyp files or targets should set chromium_code to 1 if they build
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 # Set Neon compilation flags (only meaningful if armv7==1). 104 # Set Neon compilation flags (only meaningful if armv7==1).
105 'arm_neon%': 1, 105 'arm_neon%': 1,
106 106
107 # The system root for cross-compiles. Default: none. 107 # The system root for cross-compiles. Default: none.
108 'sysroot%': '', 108 'sysroot%': '',
109 109
110 # On Linux, we build with sse2 for Chromium builds. 110 # On Linux, we build with sse2 for Chromium builds.
111 'disable_sse2%': 0, 111 'disable_sse2%': 0,
112 112
113 # Chromoting compilation is disabled by default. Set to 1 to enable. 113 # Chromoting compilation is enabled by default. Set to 0 to disable.
114 'chromoting%': 0, 114 'chromoting%': 1,
115 }, 115 },
116 116
117 # Define branding and buildtype on the basis of their settings within the 117 # Define branding and buildtype on the basis of their settings within the
118 # variables sub-dict above, unless overridden. 118 # variables sub-dict above, unless overridden.
119 'branding%': '<(branding)', 119 'branding%': '<(branding)',
120 'buildtype%': '<(buildtype)', 120 'buildtype%': '<(buildtype)',
121 'target_arch%': '<(target_arch)', 121 'target_arch%': '<(target_arch)',
122 'host_arch%': '<(host_arch)', 122 'host_arch%': '<(host_arch)',
123 'toolkit_views%': '<(toolkit_views)', 123 'toolkit_views%': '<(toolkit_views)',
124 'chromeos%': '<(chromeos)', 124 'chromeos%': '<(chromeos)',
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 'defines': ['GOOGLE_CHROME_BUILD'], 398 'defines': ['GOOGLE_CHROME_BUILD'],
399 }, { # else: branding!="Chrome" 399 }, { # else: branding!="Chrome"
400 'defines': ['CHROMIUM_BUILD'], 400 'defines': ['CHROMIUM_BUILD'],
401 }], 401 }],
402 ['toolkit_views==1', { 402 ['toolkit_views==1', {
403 'defines': ['TOOLKIT_VIEWS=1'], 403 'defines': ['TOOLKIT_VIEWS=1'],
404 }], 404 }],
405 ['chromeos==1', { 405 ['chromeos==1', {
406 'defines': ['OS_CHROMEOS=1'], 406 'defines': ['OS_CHROMEOS=1'],
407 }], 407 }],
408 ['chromoting==1', {
409 'defines': ['ENABLE_CHROMOTING=1'],
410 }],
408 ['proprietary_codecs==1', { 411 ['proprietary_codecs==1', {
409 'defines': ['USE_PROPRIETARY_CODECS'], 412 'defines': ['USE_PROPRIETARY_CODECS'],
410 }], 413 }],
411 ['fastbuild!=0', { 414 ['fastbuild!=0', {
412 'conditions': [ 415 'conditions': [
413 # Finally, for Windows, we simply turn on profiling. 416 # Finally, for Windows, we simply turn on profiling.
414 ['OS=="win"', { 417 ['OS=="win"', {
415 'msvs_settings': { 418 'msvs_settings': {
416 'VCLinkerTool': { 419 'VCLinkerTool': {
417 'GenerateDebugInformation': 'false', 420 'GenerateDebugInformation': 'false',
(...skipping 953 matching lines...) Expand 10 before | Expand all | Expand 10 after
1371 # and therefore SYMROOT, needs to be set at the project level. 1374 # and therefore SYMROOT, needs to be set at the project level.
1372 'SYMROOT': '<(DEPTH)/xcodebuild', 1375 'SYMROOT': '<(DEPTH)/xcodebuild',
1373 }, 1376 },
1374 } 1377 }
1375 1378
1376 # Local Variables: 1379 # Local Variables:
1377 # tab-width:2 1380 # tab-width:2
1378 # indent-tabs-mode:nil 1381 # indent-tabs-mode:nil
1379 # End: 1382 # End:
1380 # vim: set expandtab tabstop=2 shiftwidth=2: 1383 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | remoting/chromoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698