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

Side by Side Diff: build/common.gypi

Issue 1489403004: Remove default whitelist for grit on iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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/OWNERS » ('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 2125 matching lines...) Expand 10 before | Expand all | Expand 10 after
2136 'grit_defines': ['-D', 'scale_factors=2x'], 2136 'grit_defines': ['-D', 'scale_factors=2x'],
2137 }], 2137 }],
2138 ['OS == "ios"', { 2138 ['OS == "ios"', {
2139 'variables': { 2139 'variables': {
2140 'enable_coverage%': 0, 2140 'enable_coverage%': 0,
2141 }, 2141 },
2142 'grit_defines': [ 2142 'grit_defines': [
2143 '-t', 'ios', 2143 '-t', 'ios',
2144 '--no-output-all-resource-defines', 2144 '--no-output-all-resource-defines',
2145 ], 2145 ],
2146 # iOS uses a whitelist to filter resources.
2147 'grit_whitelist%': '<(DEPTH)/build/ios/grit_whitelist.txt',
2148
2149 # Enable host builds when generating with ninja-ios. 2146 # Enable host builds when generating with ninja-ios.
2150 'conditions': [ 2147 'conditions': [
2151 ['"<(GENERATOR)"=="ninja"', { 2148 ['"<(GENERATOR)"=="ninja"', {
2152 'host_os%': "mac", 2149 'host_os%': "mac",
2153 }], 2150 }],
2154 2151
2155 # Use the version of clang shipped with Xcode when building official 2152 # Use the version of clang shipped with Xcode when building official
2156 # version of Chrome for iOS. 2153 # version of Chrome for iOS.
2157 # 2154 #
2158 # TODO(eugenebut): Remove enable_coverage check once 2155 # TODO(eugenebut): Remove enable_coverage check once
(...skipping 4214 matching lines...) Expand 10 before | Expand all | Expand 10 after
6373 # settings in target dicts. SYMROOT is a special case, because many other 6370 # settings in target dicts. SYMROOT is a special case, because many other
6374 # Xcode variables depend on it, including variables such as 6371 # Xcode variables depend on it, including variables such as
6375 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6372 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6376 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6373 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6377 # files to appear (when present) in the UI as actual files and not red 6374 # files to appear (when present) in the UI as actual files and not red
6378 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6375 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6379 # and therefore SYMROOT, needs to be set at the project level. 6376 # and therefore SYMROOT, needs to be set at the project level.
6380 'SYMROOT': '<(DEPTH)/xcodebuild', 6377 'SYMROOT': '<(DEPTH)/xcodebuild',
6381 }, 6378 },
6382 } 6379 }
OLDNEW
« no previous file with comments | « no previous file | build/ios/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698