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

Side by Side Diff: build/common.gypi

Issue 14740022: Enable clang and host_os when generating ninja-ios. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Set host_os too 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
« 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 1492 matching lines...) Expand 10 before | Expand all | Expand 10 after
1503 ['OS=="mac"', { 1503 ['OS=="mac"', {
1504 'grit_defines': ['-D', 'scale_factors=2x'], 1504 'grit_defines': ['-D', 'scale_factors=2x'],
1505 }], 1505 }],
1506 ['OS == "ios"', { 1506 ['OS == "ios"', {
1507 'grit_defines': [ 1507 'grit_defines': [
1508 # define for iOS specific resources. 1508 # define for iOS specific resources.
1509 '-D', 'ios', 1509 '-D', 'ios',
1510 # iOS uses a whitelist to filter resources. 1510 # iOS uses a whitelist to filter resources.
1511 '-w', '<(DEPTH)/build/ios/grit_whitelist.txt' 1511 '-w', '<(DEPTH)/build/ios/grit_whitelist.txt'
1512 ], 1512 ],
1513
1514 # Enable clang and host builds when generating with ninja-ios.
1515 'conditions': [
1516 ['"<(GENERATOR)"=="ninja"', {
1517 'clang%': 1,
1518 'host_os%': "mac",
1519 }]
1520 ],
1513 }], 1521 }],
1514 ['enable_extensions==1', { 1522 ['enable_extensions==1', {
1515 'grit_defines': ['-D', 'enable_extensions'], 1523 'grit_defines': ['-D', 'enable_extensions'],
1516 }], 1524 }],
1517 ['enable_printing==1', { 1525 ['enable_printing==1', {
1518 'grit_defines': ['-D', 'enable_printing'], 1526 'grit_defines': ['-D', 'enable_printing'],
1519 }], 1527 }],
1520 ['enable_themes==1', { 1528 ['enable_themes==1', {
1521 'grit_defines': ['-D', 'enable_themes'], 1529 'grit_defines': ['-D', 'enable_themes'],
1522 }], 1530 }],
(...skipping 2921 matching lines...) Expand 10 before | Expand all | Expand 10 after
4444 # settings in target dicts. SYMROOT is a special case, because many other 4452 # settings in target dicts. SYMROOT is a special case, because many other
4445 # Xcode variables depend on it, including variables such as 4453 # Xcode variables depend on it, including variables such as
4446 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4454 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4447 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4455 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4448 # files to appear (when present) in the UI as actual files and not red 4456 # files to appear (when present) in the UI as actual files and not red
4449 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4457 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4450 # and therefore SYMROOT, needs to be set at the project level. 4458 # and therefore SYMROOT, needs to be set at the project level.
4451 'SYMROOT': '<(DEPTH)/xcodebuild', 4459 'SYMROOT': '<(DEPTH)/xcodebuild',
4452 }, 4460 },
4453 } 4461 }
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