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

Side by Side Diff: build/common.gypi

Issue 23535007: For iOS, don't override VALID_ARCHS in Debug configuration. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: chunk mismatch Created 7 years, 3 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 4641 matching lines...) Expand 10 before | Expand all | Expand 10 after
4652 ['CXX.host', '<!(which g++)'], 4652 ['CXX.host', '<!(which g++)'],
4653 ['LINK.host', '<!(which g++)'], 4653 ['LINK.host', '<!(which g++)'],
4654 ], 4654 ],
4655 }], 4655 }],
4656 ], 4656 ],
4657 'configurations': { 4657 'configurations': {
4658 # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT! 4658 # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT!
4659 # This block adds *project-wide* configuration settings to each project 4659 # This block adds *project-wide* configuration settings to each project
4660 # file. It's almost always wrong to put things here. Specify your 4660 # file. It's almost always wrong to put things here. Specify your
4661 # custom |configurations| in target_defaults to add them to targets instead. 4661 # custom |configurations| in target_defaults to add them to targets instead.
4662 'Debug': { 4662 'conditions': [
4663 'xcode_settings': { 4663 ['OS=="ios"', {
4664 # Enable 'Build Active Architecture Only' for Debug. This 4664 'Debug': {
4665 # avoids a project-level warning in Xcode. 4665 'xcode_settings': {
4666 'ONLY_ACTIVE_ARCH': 'YES', 4666 # Enable 'Build Active Architecture Only' for Debug. This
4667 }, 4667 # avoids a project-level warning in Xcode.
4668 }, 4668 # Note that this configuration uses the default VALID_ARCHS value
4669 # because if there is a device connected Xcode sets the active arch
4670 # to the arch of the device. In cases where the device's arch is not
4671 # in VALID_ARCHS (e.g. iPhone5 is armv7s) Xcode complains because it
4672 # can't determine what arch to compile for.
4673 'ONLY_ACTIVE_ARCH': 'YES',
4674 },
4675 },
4676 'Release': {
4677 'xcode_settings': {
4678 # Override VALID_ARCHS and omit armv7s. Otherwise Xcode compiles for
4679 # both armv7 and armv7s, doubling the binary size.
4680 'VALID_ARCHS': 'armv7 i386',
Mark Mentovai 2013/09/06 17:38:44 Is this supposed to be a space-separated string in
lliabraa 2013/09/06 18:12:40 Yep
4681 },
4682 },
4683 }],
4684 ],
4669 }, 4685 },
4670 'xcode_settings': { 4686 'xcode_settings': {
4671 # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT! 4687 # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT!
4672 # This block adds *project-wide* configuration settings to each project 4688 # This block adds *project-wide* configuration settings to each project
4673 # file. It's almost always wrong to put things here. Specify your 4689 # file. It's almost always wrong to put things here. Specify your
4674 # custom xcode_settings in target_defaults to add them to targets instead. 4690 # custom xcode_settings in target_defaults to add them to targets instead.
4675 4691
4676 'conditions': [ 4692 'conditions': [
4677 # In an Xcode Project Info window, the "Base SDK for All Configurations" 4693 # In an Xcode Project Info window, the "Base SDK for All Configurations"
4678 # setting sets the SDK on a project-wide basis. In order to get the 4694 # setting sets the SDK on a project-wide basis. In order to get the
(...skipping 18 matching lines...) Expand all
4697 }, { 4713 }, {
4698 'SDKROOT': 'iphonesimulator<(ios_sdk)', # -isysroot 4714 'SDKROOT': 'iphonesimulator<(ios_sdk)', # -isysroot
4699 }], 4715 }],
4700 ], 4716 ],
4701 }, { 4717 }, {
4702 'SDKROOT': '<(ios_sdk_path)', # -isysroot 4718 'SDKROOT': '<(ios_sdk_path)', # -isysroot
4703 }], 4719 }],
4704 ], 4720 ],
4705 }], 4721 }],
4706 ['OS=="ios"', { 4722 ['OS=="ios"', {
4707 # Just build armv7, until armv7s is correctly tested.
4708 'VALID_ARCHS': 'armv7 i386',
4709 # Target both iPhone and iPad. 4723 # Target both iPhone and iPad.
4710 'TARGETED_DEVICE_FAMILY': '1,2', 4724 'TARGETED_DEVICE_FAMILY': '1,2',
4711 }], 4725 }],
4712 ['target_arch=="x64"', { 4726 ['target_arch=="x64"', {
4713 'ARCHS': [ 4727 'ARCHS': [
4714 'x86_64' 4728 'x86_64'
4715 ], 4729 ],
4716 }], 4730 }],
4717 ], 4731 ],
4718 4732
4719 # The Xcode generator will look for an xcode_settings section at the root 4733 # The Xcode generator will look for an xcode_settings section at the root
4720 # of each dict and use it to apply settings on a file-wide basis. Most 4734 # of each dict and use it to apply settings on a file-wide basis. Most
4721 # settings should not be here, they should be in target-specific 4735 # settings should not be here, they should be in target-specific
4722 # xcode_settings sections, or better yet, should use non-Xcode-specific 4736 # xcode_settings sections, or better yet, should use non-Xcode-specific
4723 # settings in target dicts. SYMROOT is a special case, because many other 4737 # settings in target dicts. SYMROOT is a special case, because many other
4724 # Xcode variables depend on it, including variables such as 4738 # Xcode variables depend on it, including variables such as
4725 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4739 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4726 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4740 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4727 # files to appear (when present) in the UI as actual files and not red 4741 # files to appear (when present) in the UI as actual files and not red
4728 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4742 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4729 # and therefore SYMROOT, needs to be set at the project level. 4743 # and therefore SYMROOT, needs to be set at the project level.
4730 'SYMROOT': '<(DEPTH)/xcodebuild', 4744 'SYMROOT': '<(DEPTH)/xcodebuild',
4731 }, 4745 },
4732 } 4746 }
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