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

Side by Side Diff: build/common.gypi

Issue 11026024: Add grit_whitelist for iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address code review: Fix nits. Created 8 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
« no previous file with comments | « no previous file | build/ios/PRESUBMIT.py » ('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) 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 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after
1233 'ast', 'bs', 'ca@valencia', 'en-AU', 'eo', 'eu', 'gl', 'hy', 'ia', 1233 'ast', 'bs', 'ca@valencia', 'en-AU', 'eo', 'eu', 'gl', 'hy', 'ia',
1234 'ka', 'ku', 'kw', 'ms', 'ug' 1234 'ka', 'ku', 'kw', 'ms', 'ug'
1235 ], 1235 ],
1236 }], 1236 }],
1237 ['OS=="android"', { 1237 ['OS=="android"', {
1238 'grit_defines': ['-D', 'android'], 1238 'grit_defines': ['-D', 'android'],
1239 }], 1239 }],
1240 ['OS=="mac"', { 1240 ['OS=="mac"', {
1241 'grit_defines': ['-D', 'scale_factors=2x'], 1241 'grit_defines': ['-D', 'scale_factors=2x'],
1242 }], 1242 }],
1243 ['OS == "ios"', {
1244 'grit_defines': [
1245 # define for iOS specific resources.
1246 '-D', 'ios',
1247 # iOS uses a whitelist to filter resources.
1248 '-w', '<(DEPTH)/build/ios/grit_whitelist.txt'
1249 ],
1250 }],
1243 ['enable_extensions==1', { 1251 ['enable_extensions==1', {
1244 'grit_defines': ['-D', 'enable_extensions'], 1252 'grit_defines': ['-D', 'enable_extensions'],
1245 }], 1253 }],
1246 ['enable_printing==1', { 1254 ['enable_printing==1', {
1247 'grit_defines': ['-D', 'enable_printing'], 1255 'grit_defines': ['-D', 'enable_printing'],
1248 }], 1256 }],
1249 ['enable_themes==1', { 1257 ['enable_themes==1', {
1250 'grit_defines': ['-D', 'enable_themes'], 1258 'grit_defines': ['-D', 'enable_themes'],
1251 }], 1259 }],
1252 ['clang_use_chrome_plugins==1 and OS!="win"', { 1260 ['clang_use_chrome_plugins==1 and OS!="win"', {
(...skipping 2222 matching lines...) Expand 10 before | Expand all | Expand 10 after
3475 # settings in target dicts. SYMROOT is a special case, because many other 3483 # settings in target dicts. SYMROOT is a special case, because many other
3476 # Xcode variables depend on it, including variables such as 3484 # Xcode variables depend on it, including variables such as
3477 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3485 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3478 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3486 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3479 # files to appear (when present) in the UI as actual files and not red 3487 # files to appear (when present) in the UI as actual files and not red
3480 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3488 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3481 # and therefore SYMROOT, needs to be set at the project level. 3489 # and therefore SYMROOT, needs to be set at the project level.
3482 'SYMROOT': '<(DEPTH)/xcodebuild', 3490 'SYMROOT': '<(DEPTH)/xcodebuild',
3483 }, 3491 },
3484 } 3492 }
OLDNEW
« no previous file with comments | « no previous file | build/ios/PRESUBMIT.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698