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

Side by Side Diff: build/common.gypi

Issue 3173001: Lands http://codereview.chromium.org/3166002 for bryeung: (Closed)
Patch Set: Created 10 years, 4 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 | 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 # 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 }, { # OS!="linux" 54 }, { # OS!="linux"
55 'host_arch%': 'ia32', 55 'host_arch%': 'ia32',
56 }], 56 }],
57 ], 57 ],
58 58
59 # Whether we're building a ChromeOS build. We set the initial 59 # Whether we're building a ChromeOS build. We set the initial
60 # value at this level of nesting so it's available for the 60 # value at this level of nesting so it's available for the
61 # toolkit_views test below. 61 # toolkit_views test below.
62 'chromeos%': '0', 62 'chromeos%': '0',
63 63
64 # Disable touch support by default.
65 'touchui%': 0,
66
64 # To do a shared build on linux we need to be able to choose between 67 # To do a shared build on linux we need to be able to choose between
65 # type static_library and shared_library. We default to doing a static 68 # type static_library and shared_library. We default to doing a static
66 # build but you can override this with "gyp -Dlibrary=shared_library" 69 # build but you can override this with "gyp -Dlibrary=shared_library"
67 # or you can add the following line (without the #) to 70 # or you can add the following line (without the #) to
68 # ~/.gyp/include.gypi {'variables': {'library': 'shared_library'}} 71 # ~/.gyp/include.gypi {'variables': {'library': 'shared_library'}}
69 # to compile as shared by default 72 # to compile as shared by default
70 'library%': 'static_library', 73 'library%': 'static_library',
71 }, 74 },
72 75
73 # Set default value of toolkit_views on for Windows and Chrome OS. 76 # Set default value of toolkit_views on for Windows, Chrome OS
77 # and the touch UI.
74 # We set it at this level of nesting so the value is available for 78 # We set it at this level of nesting so the value is available for
75 # other conditionals below. 79 # other conditionals below.
76 'conditions': [ 80 'conditions': [
77 ['OS=="win" or chromeos==1', { 81 ['OS=="win" or chromeos==1 or touchui==1', {
78 'toolkit_views%': 1, 82 'toolkit_views%': 1,
79 }, { 83 }, {
80 'toolkit_views%': 0, 84 'toolkit_views%': 0,
81 }], 85 }],
82 ], 86 ],
83 87
84 'host_arch%': '<(host_arch)', 88 'host_arch%': '<(host_arch)',
85 89
86 # Default architecture we're building for is the architecture we're 90 # Default architecture we're building for is the architecture we're
87 # building on. 91 # building on.
88 'target_arch%': '<(host_arch)', 92 'target_arch%': '<(host_arch)',
89 93
90 # We do want to build Chromium with Breakpad support in certain 94 # We do want to build Chromium with Breakpad support in certain
91 # situations. I.e. for Chrome bot. 95 # situations. I.e. for Chrome bot.
92 'linux_chromium_breakpad%': 0, 96 'linux_chromium_breakpad%': 0,
93 # And if we want to dump symbols. 97 # And if we want to dump symbols.
94 'linux_chromium_dump_symbols%': 0, 98 'linux_chromium_dump_symbols%': 0,
95 # Also see linux_strip_binary below. 99 # Also see linux_strip_binary below.
96 100
97 # Copy conditionally-set chromeos variable out one scope. 101 # Copy conditionally-set chromeos and touchui variables out one scope.
98 'chromeos%': '<(chromeos)', 102 'chromeos%': '<(chromeos)',
103 'touchui%': '<(touchui)',
99 104
100 # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they are 105 # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they are
101 # are built under a chromium full build (1) or a webkit.org chromium 106 # are built under a chromium full build (1) or a webkit.org chromium
102 # build (0). 107 # build (0).
103 'inside_chromium_build%': 1, 108 'inside_chromium_build%': 1,
104 109
105 # Set to 1 to enable fast builds. It disables debug info for fastest 110 # Set to 1 to enable fast builds. It disables debug info for fastest
106 # compilation. 111 # compilation.
107 'fastbuild%': 0, 112 'fastbuild%': 0,
108 113
(...skipping 30 matching lines...) Expand all
139 }, 144 },
140 145
141 # Define branding and buildtype on the basis of their settings within the 146 # Define branding and buildtype on the basis of their settings within the
142 # variables sub-dict above, unless overridden. 147 # variables sub-dict above, unless overridden.
143 'branding%': '<(branding)', 148 'branding%': '<(branding)',
144 'buildtype%': '<(buildtype)', 149 'buildtype%': '<(buildtype)',
145 'target_arch%': '<(target_arch)', 150 'target_arch%': '<(target_arch)',
146 'host_arch%': '<(host_arch)', 151 'host_arch%': '<(host_arch)',
147 'toolkit_views%': '<(toolkit_views)', 152 'toolkit_views%': '<(toolkit_views)',
148 'chromeos%': '<(chromeos)', 153 'chromeos%': '<(chromeos)',
154 'touchui%': '<(touchui)',
149 'inside_chromium_build%': '<(inside_chromium_build)', 155 'inside_chromium_build%': '<(inside_chromium_build)',
150 'fastbuild%': '<(fastbuild)', 156 'fastbuild%': '<(fastbuild)',
151 'linux_fpic%': '<(linux_fpic)', 157 'linux_fpic%': '<(linux_fpic)',
152 'python_ver%': '<(python_ver)', 158 'python_ver%': '<(python_ver)',
153 'armv7%': '<(armv7)', 159 'armv7%': '<(armv7)',
154 'arm_neon%': '<(arm_neon)', 160 'arm_neon%': '<(arm_neon)',
155 'sysroot%': '<(sysroot)', 161 'sysroot%': '<(sysroot)',
156 'disable_sse2%': '<(disable_sse2)', 162 'disable_sse2%': '<(disable_sse2)',
157 'remoting%': '<(remoting)', 163 'remoting%': '<(remoting)',
158 'library%': '<(library)', 164 'library%': '<(library)',
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 # NOTE: When these end up in the Mac bundle, we need to replace '-' for '_' 379 # NOTE: When these end up in the Mac bundle, we need to replace '-' for '_'
374 # so Cocoa is happy (http://crbug.com/20441). 380 # so Cocoa is happy (http://crbug.com/20441).
375 'locales': [ 381 'locales': [
376 'am', 'ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 382 'am', 'ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB',
377 'en-US', 'es-419', 'es', 'et', 'fi', 'fil', 'fr', 'gu', 'he', 383 'en-US', 'es-419', 'es', 'et', 'fi', 'fil', 'fr', 'gu', 'he',
378 'hi', 'hr', 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv', 384 'hi', 'hr', 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv',
379 'ml', 'mr', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 385 'ml', 'mr', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru',
380 'sk', 'sl', 'sr', 'sv', 'sw', 'ta', 'te', 'th', 'tr', 'uk', 386 'sk', 'sl', 'sr', 'sv', 'sw', 'ta', 'te', 'th', 'tr', 'uk',
381 'vi', 'zh-CN', 'zh-TW', 387 'vi', 'zh-CN', 'zh-TW',
382 ], 388 ],
383
384 # Disable touch support by default.
385 'touchui%': 0,
386 }, 389 },
387 'target_defaults': { 390 'target_defaults': {
388 'variables': { 391 'variables': {
389 # The condition that operates on chromium_code is in a target_conditions 392 # The condition that operates on chromium_code is in a target_conditions
390 # section, and will not have access to the default fallback value of 393 # section, and will not have access to the default fallback value of
391 # chromium_code at the top of this file, or to the chromium_code 394 # chromium_code at the top of this file, or to the chromium_code
392 # variable placed at the root variables scope of .gyp files, because 395 # variable placed at the root variables scope of .gyp files, because
393 # those variables are not set at target scope. As a workaround, 396 # those variables are not set at target scope. As a workaround,
394 # if chromium_code is not set at target scope, define it in target scope 397 # if chromium_code is not set at target scope, define it in target scope
395 # to contain whatever value it has during early variable expansion. 398 # to contain whatever value it has during early variable expansion.
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1437 # and therefore SYMROOT, needs to be set at the project level. 1440 # and therefore SYMROOT, needs to be set at the project level.
1438 'SYMROOT': '<(DEPTH)/xcodebuild', 1441 'SYMROOT': '<(DEPTH)/xcodebuild',
1439 }, 1442 },
1440 } 1443 }
1441 1444
1442 # Local Variables: 1445 # Local Variables:
1443 # tab-width:2 1446 # tab-width:2
1444 # indent-tabs-mode:nil 1447 # indent-tabs-mode:nil
1445 # End: 1448 # End:
1446 # vim: set expandtab tabstop=2 shiftwidth=2: 1449 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698