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

Side by Side Diff: build/common.gypi

Issue 987793002: Update DOM Distiller roll script DEPS in out/package. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated grit to understand android webview Created 5 years, 9 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 | « DEPS ('k') | components/dom_distiller/core/javascript/domdistiller.js » ('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 2060 matching lines...) Expand 10 before | Expand all | Expand 10 after
2071 'ast', 'bs', 'ca@valencia', 'en-AU', 'eo', 'eu', 'gl', 'hy', 'ia', 2071 'ast', 'bs', 'ca@valencia', 'en-AU', 'eo', 'eu', 'gl', 'hy', 'ia',
2072 'ka', 'ku', 'kw', 'ms', 'ug' 2072 'ka', 'ku', 'kw', 'ms', 'ug'
2073 ], 2073 ],
2074 }], 2074 }],
2075 ['OS=="android"', { 2075 ['OS=="android"', {
2076 'grit_defines': [ 2076 'grit_defines': [
2077 '-t', 'android', 2077 '-t', 'android',
2078 '-E', 'ANDROID_JAVA_TAGGED_ONLY=true', 2078 '-E', 'ANDROID_JAVA_TAGGED_ONLY=true',
2079 '--no-output-all-resource-defines', 2079 '--no-output-all-resource-defines',
2080 ], 2080 ],
2081 'conditions': [
2082 ['<(android_webview_build)==1', {
2083 'grit_defines': ['-D', 'is_android_webview_build'],
2084 }],
2085 ],
2081 }], 2086 }],
2082 ['OS=="mac" or OS=="ios"', { 2087 ['OS=="mac" or OS=="ios"', {
2083 'grit_defines': ['-D', 'scale_factors=2x'], 2088 'grit_defines': ['-D', 'scale_factors=2x'],
2084 }], 2089 }],
2085 ['OS == "ios"', { 2090 ['OS == "ios"', {
2086 'variables': { 2091 'variables': {
2087 'enable_coverage%': 0, 2092 'enable_coverage%': 0,
2088 }, 2093 },
2089 'grit_defines': [ 2094 'grit_defines': [
2090 '-t', 'ios', 2095 '-t', 'ios',
(...skipping 3938 matching lines...) Expand 10 before | Expand all | Expand 10 after
6029 # settings in target dicts. SYMROOT is a special case, because many other 6034 # settings in target dicts. SYMROOT is a special case, because many other
6030 # Xcode variables depend on it, including variables such as 6035 # Xcode variables depend on it, including variables such as
6031 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6036 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6032 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6037 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6033 # files to appear (when present) in the UI as actual files and not red 6038 # files to appear (when present) in the UI as actual files and not red
6034 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6039 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6035 # and therefore SYMROOT, needs to be set at the project level. 6040 # and therefore SYMROOT, needs to be set at the project level.
6036 'SYMROOT': '<(DEPTH)/xcodebuild', 6041 'SYMROOT': '<(DEPTH)/xcodebuild',
6037 }, 6042 },
6038 } 6043 }
OLDNEW
« no previous file with comments | « DEPS ('k') | components/dom_distiller/core/javascript/domdistiller.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698