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

Side by Side Diff: build/common.gypi

Issue 47753003: Fix build for xcodebuild from Xcode 5 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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 | build/mac/verify_no_objc.sh » ('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 4630 matching lines...) Expand 10 before | Expand all | Expand 10 after
4641 ['OS=="ios"', { 4641 ['OS=="ios"', {
4642 # Target both iPhone and iPad. 4642 # Target both iPhone and iPad.
4643 'TARGETED_DEVICE_FAMILY': '1,2', 4643 'TARGETED_DEVICE_FAMILY': '1,2',
4644 'VALID_ARCHS': 'armv7 i386', 4644 'VALID_ARCHS': 'armv7 i386',
4645 }], 4645 }],
4646 ['target_arch=="x64"', { 4646 ['target_arch=="x64"', {
4647 'ARCHS': [ 4647 'ARCHS': [
4648 'x86_64' 4648 'x86_64'
4649 ], 4649 ],
4650 }], 4650 }],
4651 ['target_arch=="ia32"', {
4652 'ARCHS': [
4653 'i386'
4654 ],
4655 }],
4651 ], 4656 ],
4652 4657
4653 # The Xcode generator will look for an xcode_settings section at the root 4658 # The Xcode generator will look for an xcode_settings section at the root
4654 # of each dict and use it to apply settings on a file-wide basis. Most 4659 # of each dict and use it to apply settings on a file-wide basis. Most
4655 # settings should not be here, they should be in target-specific 4660 # settings should not be here, they should be in target-specific
4656 # xcode_settings sections, or better yet, should use non-Xcode-specific 4661 # xcode_settings sections, or better yet, should use non-Xcode-specific
4657 # settings in target dicts. SYMROOT is a special case, because many other 4662 # settings in target dicts. SYMROOT is a special case, because many other
4658 # Xcode variables depend on it, including variables such as 4663 # Xcode variables depend on it, including variables such as
4659 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4664 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4660 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4665 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4661 # files to appear (when present) in the UI as actual files and not red 4666 # files to appear (when present) in the UI as actual files and not red
4662 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4667 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4663 # and therefore SYMROOT, needs to be set at the project level. 4668 # and therefore SYMROOT, needs to be set at the project level.
4664 'SYMROOT': '<(DEPTH)/xcodebuild', 4669 'SYMROOT': '<(DEPTH)/xcodebuild',
4665 }, 4670 },
4666 } 4671 }
OLDNEW
« no previous file with comments | « no previous file | build/mac/verify_no_objc.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698