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

Side by Side Diff: build/common.gypi

Issue 692733003: Compile Android using GRIT's new --no-output-all-resource-defines flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged two ifdefs Created 6 years, 1 month 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 | chrome/browser/resources_util_unittest.cc » ('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 2052 matching lines...) Expand 10 before | Expand all | Expand 10 after
2063 'grit_defines': ['-D', 'use_titlecase'], 2063 'grit_defines': ['-D', 'use_titlecase'],
2064 }], 2064 }],
2065 ['use_third_party_translations==1', { 2065 ['use_third_party_translations==1', {
2066 'grit_defines': ['-D', 'use_third_party_translations'], 2066 'grit_defines': ['-D', 'use_third_party_translations'],
2067 'locales': [ 2067 'locales': [
2068 'ast', 'bs', 'ca@valencia', 'en-AU', 'eo', 'eu', 'gl', 'hy', 'ia', 2068 'ast', 'bs', 'ca@valencia', 'en-AU', 'eo', 'eu', 'gl', 'hy', 'ia',
2069 'ka', 'ku', 'kw', 'ms', 'ug' 2069 'ka', 'ku', 'kw', 'ms', 'ug'
2070 ], 2070 ],
2071 }], 2071 }],
2072 ['OS=="android"', { 2072 ['OS=="android"', {
2073 'grit_defines': ['-t', 'android', 2073 'grit_defines': [
2074 '-E', 'ANDROID_JAVA_TAGGED_ONLY=true'], 2074 '-t', 'android',
2075 '-E', 'ANDROID_JAVA_TAGGED_ONLY=true',
2076 '--no-output-all-resource-defines',
2077 ],
2075 }], 2078 }],
2076 ['OS=="mac" or OS=="ios"', { 2079 ['OS=="mac" or OS=="ios"', {
2077 'grit_defines': ['-D', 'scale_factors=2x'], 2080 'grit_defines': ['-D', 'scale_factors=2x'],
2078 }], 2081 }],
2079 ['OS == "ios"', { 2082 ['OS == "ios"', {
2080 'grit_defines': [ 2083 'grit_defines': [
2081 '-t', 'ios', 2084 '-t', 'ios',
2082 # iOS uses a whitelist to filter resources. 2085 # iOS uses a whitelist to filter resources.
2083 '-w', '<(DEPTH)/build/ios/grit_whitelist.txt' 2086 '-w', '<(DEPTH)/build/ios/grit_whitelist.txt'
2084 ], 2087 ],
(...skipping 3820 matching lines...) Expand 10 before | Expand all | Expand 10 after
5905 # settings in target dicts. SYMROOT is a special case, because many other 5908 # settings in target dicts. SYMROOT is a special case, because many other
5906 # Xcode variables depend on it, including variables such as 5909 # Xcode variables depend on it, including variables such as
5907 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5910 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5908 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5911 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5909 # files to appear (when present) in the UI as actual files and not red 5912 # files to appear (when present) in the UI as actual files and not red
5910 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5913 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5911 # and therefore SYMROOT, needs to be set at the project level. 5914 # and therefore SYMROOT, needs to be set at the project level.
5912 'SYMROOT': '<(DEPTH)/xcodebuild', 5915 'SYMROOT': '<(DEPTH)/xcodebuild',
5913 }, 5916 },
5914 } 5917 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698