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

Side by Side Diff: build/common.gypi

Issue 15075006: Basic device support for ninja iOS builds. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Use x86_64 for host builds 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 4143 matching lines...) Expand 10 before | Expand all | Expand 10 after
4154 # Match OS X clang C++11 warning settings. 4154 # Match OS X clang C++11 warning settings.
4155 '-Wno-c++11-narrowing', 4155 '-Wno-c++11-narrowing',
4156 '-Wno-reserved-user-defined-literal', 4156 '-Wno-reserved-user-defined-literal',
4157 ], 4157 ],
4158 }, 4158 },
4159 'target_conditions': [ 4159 'target_conditions': [
4160 ['_toolset=="host"', { 4160 ['_toolset=="host"', {
4161 'xcode_settings': { 4161 'xcode_settings': {
4162 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot 4162 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot
4163 'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)', 4163 'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)',
4164 'ARCHS': ['x86_64'],
4164 }, 4165 },
4165 }], 4166 }],
4166 ['_toolset=="target"', { 4167 ['_toolset=="target"', {
4167 'xcode_settings': { 4168 'xcode_settings': {
4168 # This section should be for overriding host settings. But, 4169 # This section should be for overriding host settings. But,
4169 # since we can't negate the iphone deployment target above, we 4170 # since we can't negate the iphone deployment target above, we
4170 # instead set it here for target only. 4171 # instead set it here for target only.
4171 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)', 4172 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)',
4172 }, 4173 },
4174 'conditions': [
4175 ['target_arch=="armv7"', {
4176 'xcode_settings': { 'ARCHS': [ 'armv7' ]},
4177 }, {
4178 'xcode_settings': { 'ARCHS': [ 'i386' ] },
Nico 2013/07/18 04:23:57 Simulator can't be 64 bit? I thought apple was try
justincohen 2013/07/18 12:05:59 Nope, looks like it's not supported. On 2013/07/
4179 }],
4180 ],
4173 }], 4181 }],
4174 ['_type=="executable"', { 4182 ['_type=="executable"', {
4175 'configurations': { 4183 'configurations': {
4176 'Release_Base': { 4184 'Release_Base': {
4177 'xcode_settings': { 4185 'xcode_settings': {
4178 'DEPLOYMENT_POSTPROCESSING': 'YES', 4186 'DEPLOYMENT_POSTPROCESSING': 'YES',
4179 'STRIP_INSTALLED_PRODUCT': 'YES', 4187 'STRIP_INSTALLED_PRODUCT': 'YES',
4180 }, 4188 },
4181 }, 4189 },
4182 'Debug_Base': { 4190 'Debug_Base': {
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
4605 }, { 4613 }, {
4606 'SDKROOT': '<(mac_sdk_path)', # -isysroot 4614 'SDKROOT': '<(mac_sdk_path)', # -isysroot
4607 }], 4615 }],
4608 ], 4616 ],
4609 }], 4617 }],
4610 ['OS=="ios"', { 4618 ['OS=="ios"', {
4611 'conditions': [ 4619 'conditions': [
4612 ['ios_sdk_path==""', { 4620 ['ios_sdk_path==""', {
4613 'conditions': [ 4621 'conditions': [
4614 # TODO(justincohen): Ninja only supports simulator for now. 4622 # TODO(justincohen): Ninja only supports simulator for now.
4615 ['"<(GENERATOR)"=="ninja"', { 4623 ['"<(GENERATOR)"=="xcode" or ("<(GENERATOR)"=="ninja" and target_a rch=="armv7")', {
4624 'SDKROOT': 'iphoneos<(ios_sdk)', # -isysroot
4625 }, {
4616 'SDKROOT': 'iphonesimulator<(ios_sdk)', # -isysroot 4626 'SDKROOT': 'iphonesimulator<(ios_sdk)', # -isysroot
4617 }, {
4618 'SDKROOT': 'iphoneos<(ios_sdk)', # -isysroot
4619 }], 4627 }],
4620 ], 4628 ],
4621 }, { 4629 }, {
4622 'SDKROOT': '<(ios_sdk_path)', # -isysroot 4630 'SDKROOT': '<(ios_sdk_path)', # -isysroot
4623 }], 4631 }],
4624 ], 4632 ],
4625 }], 4633 }],
4626 ['OS=="ios"', { 4634 ['OS=="ios"', {
4627 # Just build armv7, until armv7s is correctly tested. 4635 # Just build armv7, until armv7s is correctly tested.
4628 'VALID_ARCHS': 'armv7 i386', 4636 'VALID_ARCHS': 'armv7 i386',
4629 # Target both iPhone and iPad. 4637 # Target both iPhone and iPad.
4630 'TARGETED_DEVICE_FAMILY': '1,2', 4638 'TARGETED_DEVICE_FAMILY': '1,2',
4631 }], 4639 }],
4640 ['OS=="ios" and "<(GENERATOR)"!="ninja"', {
4641 'ARCHS': '$(ARCHS_UNIVERSAL_IPHONE_OS)',
4642 }],
4632 ['target_arch=="x64"', { 4643 ['target_arch=="x64"', {
4633 'ARCHS': [ 4644 'ARCHS': [
4634 'x86_64' 4645 'x86_64'
4635 ], 4646 ],
4636 }], 4647 }],
4637 ], 4648 ],
4638 4649
4639 # The Xcode generator will look for an xcode_settings section at the root 4650 # The Xcode generator will look for an xcode_settings section at the root
4640 # of each dict and use it to apply settings on a file-wide basis. Most 4651 # of each dict and use it to apply settings on a file-wide basis. Most
4641 # settings should not be here, they should be in target-specific 4652 # settings should not be here, they should be in target-specific
4642 # xcode_settings sections, or better yet, should use non-Xcode-specific 4653 # xcode_settings sections, or better yet, should use non-Xcode-specific
4643 # settings in target dicts. SYMROOT is a special case, because many other 4654 # settings in target dicts. SYMROOT is a special case, because many other
4644 # Xcode variables depend on it, including variables such as 4655 # Xcode variables depend on it, including variables such as
4645 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4656 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4646 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4657 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4647 # files to appear (when present) in the UI as actual files and not red 4658 # files to appear (when present) in the UI as actual files and not red
4648 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4659 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4649 # and therefore SYMROOT, needs to be set at the project level. 4660 # and therefore SYMROOT, needs to be set at the project level.
4650 'SYMROOT': '<(DEPTH)/xcodebuild', 4661 'SYMROOT': '<(DEPTH)/xcodebuild',
4651 }, 4662 },
4652 } 4663 }
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