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

Side by Side Diff: build/common.gypi

Issue 10377154: Fixing unneeded lifting of win_pch to an inner scope. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: merge 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
« 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 'use_ash%': '<(use_ash)', 69 'use_ash%': '<(use_ash)',
70 'use_openssl%': '<(use_openssl)', 70 'use_openssl%': '<(use_openssl)',
71 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 71 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
72 'enable_viewport%': '<(enable_viewport)', 72 'enable_viewport%': '<(enable_viewport)',
73 'enable_hidpi%': '<(enable_hidpi)', 73 'enable_hidpi%': '<(enable_hidpi)',
74 'enable_touch_ui%': '<(enable_touch_ui)', 74 'enable_touch_ui%': '<(enable_touch_ui)',
75 'enable_metro%': '<(enable_metro)', 75 'enable_metro%': '<(enable_metro)',
76 'android_upstream_bringup%': '<(android_upstream_bringup)', 76 'android_upstream_bringup%': '<(android_upstream_bringup)',
77 'buildtype%': '<(buildtype)', 77 'buildtype%': '<(buildtype)',
78 78
79 # Use of precompiled headers on Windows. See comment below.
80 'chromium_win_pch%': '0',
81
82 # Compute the architecture that we're building on. 79 # Compute the architecture that we're building on.
83 'conditions': [ 80 'conditions': [
84 [ 'OS=="win" or OS=="mac"', { 81 [ 'OS=="win" or OS=="mac"', {
85 'host_arch%': 'ia32', 82 'host_arch%': 'ia32',
86 }, { 83 }, {
87 # This handles the Unix platforms for which there is some support. 84 # This handles the Unix platforms for which there is some support.
88 # Anything else gets passed through, which probably won't work very 85 # Anything else gets passed through, which probably won't work very
89 # well; such hosts should pass an explicit target_arch to gyp. 86 # well; such hosts should pass an explicit target_arch to gyp.
90 'host_arch%': 87 'host_arch%':
91 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")', 88 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 'toolkit_views%': '<(toolkit_views)', 130 'toolkit_views%': '<(toolkit_views)',
134 'use_aura%': '<(use_aura)', 131 'use_aura%': '<(use_aura)',
135 'use_ash%': '<(use_ash)', 132 'use_ash%': '<(use_ash)',
136 'use_openssl%': '<(use_openssl)', 133 'use_openssl%': '<(use_openssl)',
137 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 134 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
138 'enable_viewport%': '<(enable_viewport)', 135 'enable_viewport%': '<(enable_viewport)',
139 'enable_hidpi%': '<(enable_hidpi)', 136 'enable_hidpi%': '<(enable_hidpi)',
140 'enable_touch_ui%': '<(enable_touch_ui)', 137 'enable_touch_ui%': '<(enable_touch_ui)',
141 'enable_metro%': '<(enable_metro)', 138 'enable_metro%': '<(enable_metro)',
142 'android_upstream_bringup%': '<(android_upstream_bringup)', 139 'android_upstream_bringup%': '<(android_upstream_bringup)',
143 'chromium_win_pch%': '<(chromium_win_pch)',
144 140
145 # We used to provide a variable for changing how libraries were built. 141 # We used to provide a variable for changing how libraries were built.
146 # This variable remains until we can clean up all the users. 142 # This variable remains until we can clean up all the users.
147 # This needs to be one nested variables dict in so that dependent 143 # This needs to be one nested variables dict in so that dependent
148 # gyp files can make use of it in their outer variables. (Yikes!) 144 # gyp files can make use of it in their outer variables. (Yikes!)
149 # http://code.google.com/p/chromium/issues/detail?id=83308 145 # http://code.google.com/p/chromium/issues/detail?id=83308
150 'library%': 'static_library', 146 'library%': 'static_library',
151 147
152 # Override branding to select the desired branding flavor. 148 # Override branding to select the desired branding flavor.
153 'branding%': 'Chromium', 149 'branding%': 'Chromium',
(...skipping 2934 matching lines...) Expand 10 before | Expand all | Expand 10 after
3088 # settings in target dicts. SYMROOT is a special case, because many other 3084 # settings in target dicts. SYMROOT is a special case, because many other
3089 # Xcode variables depend on it, including variables such as 3085 # Xcode variables depend on it, including variables such as
3090 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3086 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3091 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3087 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3092 # files to appear (when present) in the UI as actual files and not red 3088 # files to appear (when present) in the UI as actual files and not red
3093 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3089 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3094 # and therefore SYMROOT, needs to be set at the project level. 3090 # and therefore SYMROOT, needs to be set at the project level.
3095 'SYMROOT': '<(DEPTH)/xcodebuild', 3091 'SYMROOT': '<(DEPTH)/xcodebuild',
3096 }, 3092 },
3097 } 3093 }
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