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

Side by Side Diff: build/common.gypi

Issue 20466002: Enable HiDPI assets for the WebUI in iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 5 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 | no next file » | 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 1521 matching lines...) Expand 10 before | Expand all | Expand 10 after
1532 }], 1532 }],
1533 ['OS=="android"', { 1533 ['OS=="android"', {
1534 'grit_defines': ['-t', 'android', 1534 'grit_defines': ['-t', 'android',
1535 '-E', 'ANDROID_JAVA_TAGGED_ONLY=true'], 1535 '-E', 'ANDROID_JAVA_TAGGED_ONLY=true'],
1536 'conditions': [ 1536 'conditions': [
1537 ['google_tv==1', { 1537 ['google_tv==1', {
1538 'grit_defines': ['-D', 'google_tv'], 1538 'grit_defines': ['-D', 'google_tv'],
1539 }], 1539 }],
1540 ], 1540 ],
1541 }], 1541 }],
1542 ['OS=="mac"', { 1542 ['OS=="mac" or OS=="ios"', {
1543 'grit_defines': ['-D', 'scale_factors=2x'], 1543 'grit_defines': ['-D', 'scale_factors=2x'],
1544 }], 1544 }],
1545 ['OS == "ios"', { 1545 ['OS == "ios"', {
1546 'grit_defines': [ 1546 'grit_defines': [
1547 # define for iOS specific resources. 1547 # define for iOS specific resources.
1548 '-D', 'ios', 1548 '-D', 'ios',
1549 # iOS uses a whitelist to filter resources. 1549 # iOS uses a whitelist to filter resources.
1550 '-w', '<(DEPTH)/build/ios/grit_whitelist.txt' 1550 '-w', '<(DEPTH)/build/ios/grit_whitelist.txt'
1551 ], 1551 ],
1552 1552
(...skipping 3085 matching lines...) Expand 10 before | Expand all | Expand 10 after
4638 # settings in target dicts. SYMROOT is a special case, because many other 4638 # settings in target dicts. SYMROOT is a special case, because many other
4639 # Xcode variables depend on it, including variables such as 4639 # Xcode variables depend on it, including variables such as
4640 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4640 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4641 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4641 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4642 # files to appear (when present) in the UI as actual files and not red 4642 # files to appear (when present) in the UI as actual files and not red
4643 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4643 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4644 # and therefore SYMROOT, needs to be set at the project level. 4644 # and therefore SYMROOT, needs to be set at the project level.
4645 'SYMROOT': '<(DEPTH)/xcodebuild', 4645 'SYMROOT': '<(DEPTH)/xcodebuild',
4646 }, 4646 },
4647 } 4647 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698