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

Side by Side Diff: build/common.gypi

Issue 262027: include CHROMEOS files and defintions in TOOLKIT_VEIWS build.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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 | « base/base.gyp ('k') | chrome/app/chromium_strings.grd » ('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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 should set chromium_code to 1 if they build Chromium-specific 10 # .gyp files should set chromium_code to 1 if they build Chromium-specific
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 'defines': ['GOOGLE_CHROME_BUILD'], 262 'defines': ['GOOGLE_CHROME_BUILD'],
263 }, { # else: branding!="Chrome" 263 }, { # else: branding!="Chrome"
264 'defines': ['CHROMIUM_BUILD'], 264 'defines': ['CHROMIUM_BUILD'],
265 }], 265 }],
266 ['chrome_frame_define', { 266 ['chrome_frame_define', {
267 'defines': ['CHROME_FRAME_BUILD'], 267 'defines': ['CHROME_FRAME_BUILD'],
268 }], 268 }],
269 ['toolkit_views==1', { 269 ['toolkit_views==1', {
270 'defines': ['TOOLKIT_VIEWS=1'], 270 'defines': ['TOOLKIT_VIEWS=1'],
271 }], 271 }],
272 ['chromeos==1', { 272 ['chromeos==1 or toolkit_views==1', {
273 'defines': ['OS_CHROMEOS=1'], 273 'defines': ['OS_CHROMEOS=1'],
274 }], 274 }],
275 ['fastbuild!=0', { 275 ['fastbuild!=0', {
276 'conditions': [ 276 'conditions': [
277 # Finally, for Windows, we simply turn on profiling. 277 # Finally, for Windows, we simply turn on profiling.
278 ['OS=="win"', { 278 ['OS=="win"', {
279 'msvs_settings': { 279 'msvs_settings': {
280 'VCLinkerTool': { 280 'VCLinkerTool': {
281 'GenerateDebugInformation': 'false', 281 'GenerateDebugInformation': 'false',
282 }, 282 },
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 # and therefore SYMROOT, needs to be set at the project level. 915 # and therefore SYMROOT, needs to be set at the project level.
916 'SYMROOT': '<(DEPTH)/xcodebuild', 916 'SYMROOT': '<(DEPTH)/xcodebuild',
917 }, 917 },
918 } 918 }
919 919
920 # Local Variables: 920 # Local Variables:
921 # tab-width:2 921 # tab-width:2
922 # indent-tabs-mode:nil 922 # indent-tabs-mode:nil
923 # End: 923 # End:
924 # vim: set expandtab tabstop=2 shiftwidth=2: 924 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | chrome/app/chromium_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698