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

Side by Side Diff: build/common.gypi

Issue 149367: Replace instances of LINUX2 with OS_CHROMEOS and linux2 with chromeos. (Closed)
Patch Set: Created 11 years, 5 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 | chrome/browser/browser.h » ('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 { 5 {
6 'variables': { 6 'variables': {
7 # .gyp files should set chromium_code to 1 if they build Chromium-specific 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific
8 # code, as opposed to external code. This variable is used to control 8 # code, as opposed to external code. This variable is used to control
9 # such things as the set of warnings to enable, and whether warnings are 9 # such things as the set of warnings to enable, and whether warnings are
10 # treated as errors. 10 # treated as errors.
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 'msvs_debug_link_incremental%': '2', 73 'msvs_debug_link_incremental%': '2',
74 74
75 # The architecture that we're building on. 75 # The architecture that we're building on.
76 'target_arch%': 'ia32', 76 'target_arch%': 'ia32',
77 77
78 # By default linux does not use views. To turn on views in Linux 78 # By default linux does not use views. To turn on views in Linux
79 # set the variable GYP_DEFINES to "toolkit_views=1", or modify 79 # set the variable GYP_DEFINES to "toolkit_views=1", or modify
80 # ~/.gyp/include.gypi . 80 # ~/.gyp/include.gypi .
81 'toolkit_views%': 0, 81 'toolkit_views%': 0,
82 82
83 'linux2%': 0, 83 'chromeos%': 0,
84 84
85 'chrome_personalization%': 0, 85 'chrome_personalization%': 0,
86 }, 86 },
87 'target_defaults': { 87 'target_defaults': {
88 'conditions': [ 88 'conditions': [
89 ['branding=="Chrome"', { 89 ['branding=="Chrome"', {
90 'defines': ['GOOGLE_CHROME_BUILD'], 90 'defines': ['GOOGLE_CHROME_BUILD'],
91 'conditions': [ 91 'conditions': [
92 ['OS=="linux"', { 92 ['OS=="linux"', {
93 'cflags': [ '-gstabs' ], 93 'cflags': [ '-gstabs' ],
94 }], 94 }],
95 ], 95 ],
96 }, { # else: branding!="Chrome" 96 }, { # else: branding!="Chrome"
97 'defines': ['CHROMIUM_BUILD'], 97 'defines': ['CHROMIUM_BUILD'],
98 }], 98 }],
99 ['toolkit_views==1', { 99 ['toolkit_views==1', {
100 'defines': ['TOOLKIT_VIEWS=1'], 100 'defines': ['TOOLKIT_VIEWS=1'],
101 }], 101 }],
102 ['linux2==1', { 102 ['chromeos==1', {
103 'defines': ['LINUX2=1'], 103 'defines': ['OS_CHROMEOS=1'],
104 }], 104 }],
105 ['chrome_personalization==1', { 105 ['chrome_personalization==1', {
106 'defines': ['CHROME_PERSONALIZATION=1'], 106 'defines': ['CHROME_PERSONALIZATION=1'],
107 }], 107 }],
108 ['coverage!=0', { 108 ['coverage!=0', {
109 'conditions': [ 109 'conditions': [
110 ['OS=="mac"', { 110 ['OS=="mac"', {
111 'xcode_settings': { 111 'xcode_settings': {
112 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS': 'YES', 112 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS': 'YES',
113 'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES', 113 'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES',
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 # settings in target dicts. SYMROOT is a special case, because many other 582 # settings in target dicts. SYMROOT is a special case, because many other
583 # Xcode variables depend on it, including variables such as 583 # Xcode variables depend on it, including variables such as
584 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 584 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
585 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 585 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
586 # files to appear (when present) in the UI as actual files and not red 586 # files to appear (when present) in the UI as actual files and not red
587 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 587 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
588 # and therefore SYMROOT, needs to be set at the project level. 588 # and therefore SYMROOT, needs to be set at the project level.
589 'SYMROOT': '<(DEPTH)/xcodebuild', 589 'SYMROOT': '<(DEPTH)/xcodebuild',
590 }, 590 },
591 } 591 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698