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

Side by Side Diff: build/common.gypi

Issue 862043002: Change grit whitelist to a string parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | build/grit_action.gypi » ('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 2042 matching lines...) Expand 10 before | Expand all | Expand 10 after
2053 '-E', 'ANDROID_JAVA_TAGGED_ONLY=true', 2053 '-E', 'ANDROID_JAVA_TAGGED_ONLY=true',
2054 '--no-output-all-resource-defines', 2054 '--no-output-all-resource-defines',
2055 ], 2055 ],
2056 }], 2056 }],
2057 ['OS=="mac" or OS=="ios"', { 2057 ['OS=="mac" or OS=="ios"', {
2058 'grit_defines': ['-D', 'scale_factors=2x'], 2058 'grit_defines': ['-D', 'scale_factors=2x'],
2059 }], 2059 }],
2060 ['OS == "ios"', { 2060 ['OS == "ios"', {
2061 'grit_defines': [ 2061 'grit_defines': [
2062 '-t', 'ios', 2062 '-t', 'ios',
2063 # iOS uses a whitelist to filter resources.
2064 '-w', '<(DEPTH)/build/ios/grit_whitelist.txt',
2065 '--no-output-all-resource-defines', 2063 '--no-output-all-resource-defines',
2066 ], 2064 ],
2065 # iOS uses a whitelist to filter resources.
2066 'grit_whitelist%': '<(DEPTH)/build/ios/grit_whitelist.txt',
2067 2067
2068 # Enable host builds when generating with ninja-ios. 2068 # Enable host builds when generating with ninja-ios.
2069 'conditions': [ 2069 'conditions': [
2070 ['"<(GENERATOR)"=="ninja"', { 2070 ['"<(GENERATOR)"=="ninja"', {
2071 'host_os%': "mac", 2071 'host_os%': "mac",
2072 }], 2072 }],
2073 2073
2074 # TODO(sdefresne): Remove the target_subarch check once Apple has 2074 # TODO(sdefresne): Remove the target_subarch check once Apple has
2075 # upstreamed the support for "arm64". http://crbug.com/341453 2075 # upstreamed the support for "arm64". http://crbug.com/341453
2076 ['target_subarch!="arm32" or "<(GENERATOR)"=="xcode"', { 2076 ['target_subarch!="arm32" or "<(GENERATOR)"=="xcode"', {
(...skipping 3774 matching lines...) Expand 10 before | Expand all | Expand 10 after
5851 # settings in target dicts. SYMROOT is a special case, because many other 5851 # settings in target dicts. SYMROOT is a special case, because many other
5852 # Xcode variables depend on it, including variables such as 5852 # Xcode variables depend on it, including variables such as
5853 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5853 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5854 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5854 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5855 # files to appear (when present) in the UI as actual files and not red 5855 # files to appear (when present) in the UI as actual files and not red
5856 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5856 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5857 # and therefore SYMROOT, needs to be set at the project level. 5857 # and therefore SYMROOT, needs to be set at the project level.
5858 'SYMROOT': '<(DEPTH)/xcodebuild', 5858 'SYMROOT': '<(DEPTH)/xcodebuild',
5859 }, 5859 },
5860 } 5860 }
OLDNEW
« no previous file with comments | « no previous file | build/grit_action.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698