OLD | NEW |
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 4646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4657 ], | 4657 ], |
4658 }, { | 4658 }, { |
4659 'SDKROOT': '<(ios_sdk_path)', # -isysroot | 4659 'SDKROOT': '<(ios_sdk_path)', # -isysroot |
4660 }], | 4660 }], |
4661 ], | 4661 ], |
4662 }], | 4662 }], |
4663 ['OS=="ios"', { | 4663 ['OS=="ios"', { |
4664 # Target both iPhone and iPad. | 4664 # Target both iPhone and iPad. |
4665 'TARGETED_DEVICE_FAMILY': '1,2', | 4665 'TARGETED_DEVICE_FAMILY': '1,2', |
4666 'VALID_ARCHS': 'armv7 i386', | 4666 'VALID_ARCHS': 'armv7 i386', |
4667 }], | 4667 }, { # OS!="ios" |
4668 ['target_arch=="x64"', { | 4668 'conditions': [ |
4669 'ARCHS': [ | 4669 ['target_arch=="x64"', { |
4670 'x86_64' | 4670 'ARCHS': [ |
4671 ], | 4671 'x86_64' |
4672 }], | 4672 ], |
4673 ['target_arch=="ia32"', { | 4673 }], |
4674 'ARCHS': [ | 4674 ['target_arch=="ia32"', { |
4675 'i386' | 4675 'ARCHS': [ |
4676 ], | 4676 'i386' |
| 4677 ], |
| 4678 }], |
| 4679 ], |
4677 }], | 4680 }], |
4678 ], | 4681 ], |
4679 | 4682 |
4680 # The Xcode generator will look for an xcode_settings section at the root | 4683 # The Xcode generator will look for an xcode_settings section at the root |
4681 # of each dict and use it to apply settings on a file-wide basis. Most | 4684 # of each dict and use it to apply settings on a file-wide basis. Most |
4682 # settings should not be here, they should be in target-specific | 4685 # settings should not be here, they should be in target-specific |
4683 # xcode_settings sections, or better yet, should use non-Xcode-specific | 4686 # xcode_settings sections, or better yet, should use non-Xcode-specific |
4684 # settings in target dicts. SYMROOT is a special case, because many other | 4687 # settings in target dicts. SYMROOT is a special case, because many other |
4685 # Xcode variables depend on it, including variables such as | 4688 # Xcode variables depend on it, including variables such as |
4686 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4689 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
4687 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4690 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
4688 # files to appear (when present) in the UI as actual files and not red | 4691 # files to appear (when present) in the UI as actual files and not red |
4689 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4692 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
4690 # and therefore SYMROOT, needs to be set at the project level. | 4693 # and therefore SYMROOT, needs to be set at the project level. |
4691 'SYMROOT': '<(DEPTH)/xcodebuild', | 4694 'SYMROOT': '<(DEPTH)/xcodebuild', |
4692 }, | 4695 }, |
4693 } | 4696 } |
OLD | NEW |