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

Side by Side Diff: build/common.gypi

Issue 14597007: Support target/host architecture with ninja iOS builds (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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
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 4012 matching lines...) Expand 10 before | Expand all | Expand 10 after
4023 # Clang spots more unused functions. 4023 # Clang spots more unused functions.
4024 '-Wno-unused-function', 4024 '-Wno-unused-function',
4025 # See comments on this flag higher up in this file. 4025 # See comments on this flag higher up in this file.
4026 '-Wno-unnamed-type-template-args', 4026 '-Wno-unnamed-type-template-args',
4027 # This (rightfully) complains about 'override', which we use 4027 # This (rightfully) complains about 'override', which we use
4028 # heavily. 4028 # heavily.
4029 '-Wno-c++11-extensions', 4029 '-Wno-c++11-extensions',
4030 ], 4030 ],
4031 }, 4031 },
4032 'target_conditions': [ 4032 'target_conditions': [
4033 ['_toolset=="host"', {
4034 'xcode_settings': {
4035 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot
4036 'MACOSX_DEPLOYMENT_TARGET': "10.6",
stuartmorgan 2013/05/06 11:56:35 This is now hard-coded in a bunch of places in thi
justincohen 2013/05/06 14:17:36 Done.
4037 },
4038 }],
4039 ['_toolset=="target"', {
4040 'xcode_settings': {
4041 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)',
4042 },
4043 }],
4033 ['_type=="executable"', { 4044 ['_type=="executable"', {
4034 'configurations': { 4045 'configurations': {
4035 'Release_Base': { 4046 'Release_Base': {
4036 'xcode_settings': { 4047 'xcode_settings': {
4037 'DEPLOYMENT_POSTPROCESSING': 'YES', 4048 'DEPLOYMENT_POSTPROCESSING': 'YES',
4038 'STRIP_INSTALLED_PRODUCT': 'YES', 4049 'STRIP_INSTALLED_PRODUCT': 'YES',
4039 }, 4050 },
4040 }, 4051 },
4041 'Debug_Base': { 4052 'Debug_Base': {
4042 'xcode_settings': { 4053 'xcode_settings': {
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
4419 ], 4430 ],
4420 }, { 4431 }, {
4421 'SDKROOT': '<(ios_sdk_path)', # -isysroot 4432 'SDKROOT': '<(ios_sdk_path)', # -isysroot
4422 }], 4433 }],
4423 ], 4434 ],
4424 }], 4435 }],
4425 ['OS=="ios"', { 4436 ['OS=="ios"', {
4426 'ARCHS': '$(ARCHS_UNIVERSAL_IPHONE_OS)', 4437 'ARCHS': '$(ARCHS_UNIVERSAL_IPHONE_OS)',
4427 # Just build armv7, until armv7s is correctly tested. 4438 # Just build armv7, until armv7s is correctly tested.
4428 'VALID_ARCHS': 'armv7 i386', 4439 'VALID_ARCHS': 'armv7 i386',
4429 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)',
4430 # Target both iPhone and iPad. 4440 # Target both iPhone and iPad.
4431 'TARGETED_DEVICE_FAMILY': '1,2', 4441 'TARGETED_DEVICE_FAMILY': '1,2',
4432 }], 4442 }],
4433 ['target_arch=="x64"', { 4443 ['target_arch=="x64"', {
4434 'ARCHS': [ 4444 'ARCHS': [
4435 'x86_64' 4445 'x86_64'
4436 ], 4446 ],
4437 }], 4447 }],
4438 ], 4448 ],
4439 4449
4440 # The Xcode generator will look for an xcode_settings section at the root 4450 # The Xcode generator will look for an xcode_settings section at the root
4441 # of each dict and use it to apply settings on a file-wide basis. Most 4451 # of each dict and use it to apply settings on a file-wide basis. Most
4442 # settings should not be here, they should be in target-specific 4452 # settings should not be here, they should be in target-specific
4443 # xcode_settings sections, or better yet, should use non-Xcode-specific 4453 # xcode_settings sections, or better yet, should use non-Xcode-specific
4444 # settings in target dicts. SYMROOT is a special case, because many other 4454 # settings in target dicts. SYMROOT is a special case, because many other
4445 # Xcode variables depend on it, including variables such as 4455 # Xcode variables depend on it, including variables such as
4446 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4456 # 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 4457 # 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 4458 # 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, 4459 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4450 # and therefore SYMROOT, needs to be set at the project level. 4460 # and therefore SYMROOT, needs to be set at the project level.
4451 'SYMROOT': '<(DEPTH)/xcodebuild', 4461 'SYMROOT': '<(DEPTH)/xcodebuild',
4452 }, 4462 },
4453 } 4463 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698