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

Side by Side Diff: build/common.gypi

Issue 10392091: Disabling precompiled headers for official builds with msvs2010 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix accidental move Created 8 years, 7 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 | « 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 'enable_touch_ui%': 0, 45 'enable_touch_ui%': 0,
46 46
47 # Enable inclusion of touch-optimized resources. 47 # Enable inclusion of touch-optimized resources.
48 # TODO(joi): Rename to enable_touch_assets. 48 # TODO(joi): Rename to enable_touch_assets.
49 'enable_metro%': 0, 49 'enable_metro%': 0,
50 50
51 # Is this change part of the android upstream bringup? 51 # Is this change part of the android upstream bringup?
52 # Allows us to *temporarily* disable certain things for 52 # Allows us to *temporarily* disable certain things for
53 # staging. Only set to 1 in a GYP_DEFINES. 53 # staging. Only set to 1 in a GYP_DEFINES.
54 'android_upstream_bringup%': 0, 54 'android_upstream_bringup%': 0,
55
56 # Override buildtype to select the desired build flavor.
57 # Dev - everyday build for development/testing
58 # Official - release build (generally implies additional processing)
59 # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
60 # conversion is done), some of the things which are now controlled by
61 # 'branding', such as symbol generation, will need to be refactored
62 # based on 'buildtype' (i.e. we don't care about saving symbols for
63 # non-Official # builds).
64 'buildtype%': 'Dev',
55 }, 65 },
56 # Copy conditionally-set variables out one scope. 66 # Copy conditionally-set variables out one scope.
57 'chromeos%': '<(chromeos)', 67 'chromeos%': '<(chromeos)',
58 'use_aura%': '<(use_aura)', 68 'use_aura%': '<(use_aura)',
59 'use_ash%': '<(use_ash)', 69 'use_ash%': '<(use_ash)',
60 'use_openssl%': '<(use_openssl)', 70 'use_openssl%': '<(use_openssl)',
61 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 71 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
62 'enable_viewport%': '<(enable_viewport)', 72 'enable_viewport%': '<(enable_viewport)',
63 'enable_hidpi%': '<(enable_hidpi)', 73 'enable_hidpi%': '<(enable_hidpi)',
64 'enable_touch_ui%': '<(enable_touch_ui)', 74 'enable_touch_ui%': '<(enable_touch_ui)',
65 'enable_metro%': '<(enable_metro)', 75 'enable_metro%': '<(enable_metro)',
66 'android_upstream_bringup%': '<(android_upstream_bringup)', 76 'android_upstream_bringup%': '<(android_upstream_bringup)',
77 'buildtype%': '<(buildtype)',
67 78
68 # Compute the architecture that we're building on. 79 # Compute the architecture that we're building on.
69 'conditions': [ 80 'conditions': [
70 [ 'OS=="win" or OS=="mac"', { 81 [ 'OS=="win" or OS=="mac"', {
71 'host_arch%': 'ia32', 82 'host_arch%': 'ia32',
72 }, { 83 }, {
73 # This handles the Unix platforms for which there is some support. 84 # This handles the Unix platforms for which there is some support.
74 # Anything else gets passed through, which probably won't work very 85 # Anything else gets passed through, which probably won't work very
75 # well; such hosts should pass an explicit target_arch to gyp. 86 # well; such hosts should pass an explicit target_arch to gyp.
76 'host_arch%': 87 'host_arch%':
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 'toolkit_views%': '<(toolkit_views)', 130 'toolkit_views%': '<(toolkit_views)',
120 'use_aura%': '<(use_aura)', 131 'use_aura%': '<(use_aura)',
121 'use_ash%': '<(use_ash)', 132 'use_ash%': '<(use_ash)',
122 'use_openssl%': '<(use_openssl)', 133 'use_openssl%': '<(use_openssl)',
123 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 134 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
124 'enable_viewport%': '<(enable_viewport)', 135 'enable_viewport%': '<(enable_viewport)',
125 'enable_hidpi%': '<(enable_hidpi)', 136 'enable_hidpi%': '<(enable_hidpi)',
126 'enable_touch_ui%': '<(enable_touch_ui)', 137 'enable_touch_ui%': '<(enable_touch_ui)',
127 'enable_metro%': '<(enable_metro)', 138 'enable_metro%': '<(enable_metro)',
128 'android_upstream_bringup%': '<(android_upstream_bringup)', 139 'android_upstream_bringup%': '<(android_upstream_bringup)',
140 'chromium_win_pch%': '<(chromium_win_pch)',
129 141
130 # We used to provide a variable for changing how libraries were built. 142 # We used to provide a variable for changing how libraries were built.
131 # This variable remains until we can clean up all the users. 143 # This variable remains until we can clean up all the users.
132 # This needs to be one nested variables dict in so that dependent 144 # This needs to be one nested variables dict in so that dependent
133 # gyp files can make use of it in their outer variables. (Yikes!) 145 # gyp files can make use of it in their outer variables. (Yikes!)
134 # http://code.google.com/p/chromium/issues/detail?id=83308 146 # http://code.google.com/p/chromium/issues/detail?id=83308
135 'library%': 'static_library', 147 'library%': 'static_library',
136 148
137 # Override branding to select the desired branding flavor. 149 # Override branding to select the desired branding flavor.
138 'branding%': 'Chromium', 150 'branding%': 'Chromium',
139 151
140 # Override buildtype to select the desired build flavor. 152 'buildtype%': '<(buildtype)',
141 # Dev - everyday build for development/testing
142 # Official - release build (generally implies additional processing)
143 # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
144 # conversion is done), some of the things which are now controlled by
145 # 'branding', such as symbol generation, will need to be refactored based
146 # on 'buildtype' (i.e. we don't care about saving symbols for non-Official
147 # builds).
148 'buildtype%': 'Dev',
149 153
150 # Default architecture we're building for is the architecture we're 154 # Default architecture we're building for is the architecture we're
151 # building on. 155 # building on.
152 'target_arch%': '<(host_arch)', 156 'target_arch%': '<(host_arch)',
153 157
154 # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they are 158 # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they are
155 # are built under a chromium full build (1) or a webkit.org chromium 159 # are built under a chromium full build (1) or a webkit.org chromium
156 # build (0). 160 # build (0).
157 'inside_chromium_build%': 1, 161 'inside_chromium_build%': 1,
158 162
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 438
435 # Use GPU accelerated cross process image transport by default 439 # Use GPU accelerated cross process image transport by default
436 # on linux builds with the Aura window manager 440 # on linux builds with the Aura window manager
437 ['use_aura==1 and OS=="linux"', { 441 ['use_aura==1 and OS=="linux"', {
438 'ui_compositor_image_transport%': 1, 442 'ui_compositor_image_transport%': 1,
439 }, { 443 }, {
440 'ui_compositor_image_transport%': 0, 444 'ui_compositor_image_transport%': 0,
441 }], 445 }],
442 446
443 # Turn precompiled headers on by default for VS 2010. 447 # Turn precompiled headers on by default for VS 2010.
444 ['OS=="win" and MSVS_VERSION=="2010"', { 448 ['OS=="win" and MSVS_VERSION=="2010" and buildtype!="Official"', {
445 'chromium_win_pch%': 1 449 'chromium_win_pch%': 1
446 }], 450 }],
447 451
448 ['use_aura==1 or chromeos==1 or OS=="android"', { 452 ['use_aura==1 or chromeos==1 or OS=="android"', {
449 'enable_plugin_installation%': 0, 453 'enable_plugin_installation%': 0,
450 }, { 454 }, {
451 'enable_plugin_installation%': 1, 455 'enable_plugin_installation%': 1,
452 }], 456 }],
453 457
454 ['OS=="android"', { 458 ['OS=="android"', {
(...skipping 2605 matching lines...) Expand 10 before | Expand all | Expand 10 after
3060 # settings in target dicts. SYMROOT is a special case, because many other 3064 # settings in target dicts. SYMROOT is a special case, because many other
3061 # Xcode variables depend on it, including variables such as 3065 # Xcode variables depend on it, including variables such as
3062 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3066 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3063 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3067 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3064 # files to appear (when present) in the UI as actual files and not red 3068 # files to appear (when present) in the UI as actual files and not red
3065 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3069 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3066 # and therefore SYMROOT, needs to be set at the project level. 3070 # and therefore SYMROOT, needs to be set at the project level.
3067 'SYMROOT': '<(DEPTH)/xcodebuild', 3071 'SYMROOT': '<(DEPTH)/xcodebuild',
3068 }, 3072 },
3069 } 3073 }
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