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

Side by Side Diff: build/common.gypi

Issue 14834011: Android: use grit target platform instead of define. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add missed pp_ifdef(android) Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/app/bookmarks_strings.grdp » ('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 1475 matching lines...) Expand 10 before | Expand all | Expand 10 after
1486 'grit_defines': ['-D', 'use_titlecase'], 1486 'grit_defines': ['-D', 'use_titlecase'],
1487 }], 1487 }],
1488 ['use_third_party_translations==1', { 1488 ['use_third_party_translations==1', {
1489 'grit_defines': ['-D', 'use_third_party_translations'], 1489 'grit_defines': ['-D', 'use_third_party_translations'],
1490 'locales': [ 1490 'locales': [
1491 'ast', 'bs', 'ca@valencia', 'en-AU', 'eo', 'eu', 'gl', 'hy', 'ia', 1491 'ast', 'bs', 'ca@valencia', 'en-AU', 'eo', 'eu', 'gl', 'hy', 'ia',
1492 'ka', 'ku', 'kw', 'ms', 'ug' 1492 'ka', 'ku', 'kw', 'ms', 'ug'
1493 ], 1493 ],
1494 }], 1494 }],
1495 ['OS=="android"', { 1495 ['OS=="android"', {
1496 'grit_defines': ['-D', 'android', 1496 'grit_defines': ['-t', 'android',
1497 '-E', 'ANDROID_JAVA_TAGGED_ONLY=true'], 1497 '-E', 'ANDROID_JAVA_TAGGED_ONLY=true'],
1498 }], 1498 }],
1499 ['OS=="mac"', { 1499 ['OS=="mac"', {
1500 'grit_defines': ['-D', 'scale_factors=2x'], 1500 'grit_defines': ['-D', 'scale_factors=2x'],
1501 }], 1501 }],
1502 ['OS == "ios"', { 1502 ['OS == "ios"', {
1503 'grit_defines': [ 1503 'grit_defines': [
1504 # define for iOS specific resources. 1504 # define for iOS specific resources.
1505 '-D', 'ios', 1505 '-D', 'ios',
1506 # iOS uses a whitelist to filter resources. 1506 # iOS uses a whitelist to filter resources.
(...skipping 2932 matching lines...) Expand 10 before | Expand all | Expand 10 after
4439 # settings in target dicts. SYMROOT is a special case, because many other 4439 # settings in target dicts. SYMROOT is a special case, because many other
4440 # Xcode variables depend on it, including variables such as 4440 # Xcode variables depend on it, including variables such as
4441 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4441 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4442 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4442 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4443 # files to appear (when present) in the UI as actual files and not red 4443 # files to appear (when present) in the UI as actual files and not red
4444 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4444 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4445 # and therefore SYMROOT, needs to be set at the project level. 4445 # and therefore SYMROOT, needs to be set at the project level.
4446 'SYMROOT': '<(DEPTH)/xcodebuild', 4446 'SYMROOT': '<(DEPTH)/xcodebuild',
4447 }, 4447 },
4448 } 4448 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/bookmarks_strings.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698