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

Side by Side Diff: build/common.gypi

Issue 22600003: Switch to using '-t ios' for grit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 4 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/chromium_strings.grd » ('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 1550 matching lines...) Expand 10 before | Expand all | Expand 10 after
1561 ['google_tv==1', { 1561 ['google_tv==1', {
1562 'grit_defines': ['-D', 'google_tv'], 1562 'grit_defines': ['-D', 'google_tv'],
1563 }], 1563 }],
1564 ], 1564 ],
1565 }], 1565 }],
1566 ['OS=="mac" or OS=="ios"', { 1566 ['OS=="mac" or OS=="ios"', {
1567 'grit_defines': ['-D', 'scale_factors=2x'], 1567 'grit_defines': ['-D', 'scale_factors=2x'],
1568 }], 1568 }],
1569 ['OS == "ios"', { 1569 ['OS == "ios"', {
1570 'grit_defines': [ 1570 'grit_defines': [
1571 # define for iOS specific resources. 1571 '-t', 'ios',
1572 '-D', 'ios',
1573 # iOS uses a whitelist to filter resources. 1572 # iOS uses a whitelist to filter resources.
1574 '-w', '<(DEPTH)/build/ios/grit_whitelist.txt' 1573 '-w', '<(DEPTH)/build/ios/grit_whitelist.txt'
1575 ], 1574 ],
1576 1575
1577 # Enable clang and host builds when generating with ninja-ios. 1576 # Enable clang and host builds when generating with ninja-ios.
1578 'conditions': [ 1577 'conditions': [
1579 ['"<(GENERATOR)"=="ninja"', { 1578 ['"<(GENERATOR)"=="ninja"', {
1580 'clang%': 1, 1579 'clang%': 1,
1581 'host_os%': "mac", 1580 'host_os%': "mac",
1582 }] 1581 }]
(...skipping 3121 matching lines...) Expand 10 before | Expand all | Expand 10 after
4704 # settings in target dicts. SYMROOT is a special case, because many other 4703 # settings in target dicts. SYMROOT is a special case, because many other
4705 # Xcode variables depend on it, including variables such as 4704 # Xcode variables depend on it, including variables such as
4706 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4705 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4707 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4706 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4708 # files to appear (when present) in the UI as actual files and not red 4707 # files to appear (when present) in the UI as actual files and not red
4709 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4708 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4710 # and therefore SYMROOT, needs to be set at the project level. 4709 # and therefore SYMROOT, needs to be set at the project level.
4711 'SYMROOT': '<(DEPTH)/xcodebuild', 4710 'SYMROOT': '<(DEPTH)/xcodebuild',
4712 }, 4711 },
4713 } 4712 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/chromium_strings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698