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

Side by Side Diff: build/common.gypi

Issue 542078: Adding a secondary mini_installer target for Chrome Frame. This will remove t... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 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 | « build/all.gyp ('k') | chrome/chrome.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) 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 'win_use_allocator_shim%': 1, # 0 = shim allocator via libcmt; 1 = msvcrt 142 'win_use_allocator_shim%': 1, # 0 = shim allocator via libcmt; 1 = msvcrt
143 143
144 # To do a shared build on linux we need to be able to choose between type 144 # To do a shared build on linux we need to be able to choose between type
145 # static_library and shared_library. We default to doing a static build 145 # static_library and shared_library. We default to doing a static build
146 # but you can override this with "gyp -Dlibrary=shared_library" or you 146 # but you can override this with "gyp -Dlibrary=shared_library" or you
147 # can add the following line (without the #) to ~/.gyp/include.gypi 147 # can add the following line (without the #) to ~/.gyp/include.gypi
148 # {'variables': {'library': 'shared_library'}} 148 # {'variables': {'library': 'shared_library'}}
149 # to compile as shared by default 149 # to compile as shared by default
150 'library%': 'static_library', 150 'library%': 'static_library',
151 151
152 # The Google Update appid.
153 'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}',
154
155 # Whether to add the experimental build define.
156 'chrome_frame_define%': 0,
157
158 # Whether usage of OpenMAX is enabled. 152 # Whether usage of OpenMAX is enabled.
159 'enable_openmax%': 0, 153 'enable_openmax%': 0,
160 154
161 # TODO(bradnelson): eliminate this when possible. 155 # TODO(bradnelson): eliminate this when possible.
162 # To allow local gyp files to prevent release.vsprops from being included. 156 # To allow local gyp files to prevent release.vsprops from being included.
163 # Yes(1) means include release.vsprops. 157 # Yes(1) means include release.vsprops.
164 # Once all vsprops settings are migrated into gyp, this can go away. 158 # Once all vsprops settings are migrated into gyp, this can go away.
165 'msvs_use_common_release%': 1, 159 'msvs_use_common_release%': 1,
166 160
167 # TODO(bradnelson): eliminate this when possible. 161 # TODO(bradnelson): eliminate this when possible.
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 'release_extra_cflags%': '', 306 'release_extra_cflags%': '',
313 'debug_extra_cflags%': '', 307 'debug_extra_cflags%': '',
314 'release_valgrind_build%': 0, 308 'release_valgrind_build%': 0,
315 }, 309 },
316 'conditions': [ 310 'conditions': [
317 ['branding=="Chrome"', { 311 ['branding=="Chrome"', {
318 'defines': ['GOOGLE_CHROME_BUILD'], 312 'defines': ['GOOGLE_CHROME_BUILD'],
319 }, { # else: branding!="Chrome" 313 }, { # else: branding!="Chrome"
320 'defines': ['CHROMIUM_BUILD'], 314 'defines': ['CHROMIUM_BUILD'],
321 }], 315 }],
322 ['chrome_frame_define', {
323 'defines': ['CHROME_FRAME_BUILD'],
324 }],
325 ['toolkit_views==1 or chromeos==1', { 316 ['toolkit_views==1 or chromeos==1', {
326 'defines': ['TOOLKIT_VIEWS=1'], 317 'defines': ['TOOLKIT_VIEWS=1'],
327 }], 318 }],
328 ['chromeos==1', { 319 ['chromeos==1', {
329 'defines': ['OS_CHROMEOS=1'], 320 'defines': ['OS_CHROMEOS=1'],
330 }], 321 }],
331 ['fastbuild!=0', { 322 ['fastbuild!=0', {
332 'conditions': [ 323 'conditions': [
333 # Finally, for Windows, we simply turn on profiling. 324 # Finally, for Windows, we simply turn on profiling.
334 ['OS=="win"', { 325 ['OS=="win"', {
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
1163 # and therefore SYMROOT, needs to be set at the project level. 1154 # and therefore SYMROOT, needs to be set at the project level.
1164 'SYMROOT': '<(DEPTH)/xcodebuild', 1155 'SYMROOT': '<(DEPTH)/xcodebuild',
1165 }, 1156 },
1166 } 1157 }
1167 1158
1168 # Local Variables: 1159 # Local Variables:
1169 # tab-width:2 1160 # tab-width:2
1170 # indent-tabs-mode:nil 1161 # indent-tabs-mode:nil
1171 # End: 1162 # End:
1172 # vim: set expandtab tabstop=2 shiftwidth=2: 1163 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698