| 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 3950 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3961 ], | 3961 ], |
| 3962 }], | 3962 }], |
| 3963 ['OS=="ios"', { | 3963 ['OS=="ios"', { |
| 3964 'ARCHS': '$(ARCHS_UNIVERSAL_IPHONE_OS)', | 3964 'ARCHS': '$(ARCHS_UNIVERSAL_IPHONE_OS)', |
| 3965 # Just build armv7, until armv7s is correctly tested. | 3965 # Just build armv7, until armv7s is correctly tested. |
| 3966 'VALID_ARCHS': 'armv7 i386', | 3966 'VALID_ARCHS': 'armv7 i386', |
| 3967 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)', | 3967 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)', |
| 3968 # Target both iPhone and iPad. | 3968 # Target both iPhone and iPad. |
| 3969 'TARGETED_DEVICE_FAMILY': '1,2', | 3969 'TARGETED_DEVICE_FAMILY': '1,2', |
| 3970 }], | 3970 }], |
| 3971 ['target_arch=="x64"', { |
| 3972 'ARCHS': [ |
| 3973 'x86_64' |
| 3974 ], |
| 3975 }], |
| 3971 ], | 3976 ], |
| 3972 | 3977 |
| 3973 # The Xcode generator will look for an xcode_settings section at the root | 3978 # The Xcode generator will look for an xcode_settings section at the root |
| 3974 # of each dict and use it to apply settings on a file-wide basis. Most | 3979 # of each dict and use it to apply settings on a file-wide basis. Most |
| 3975 # settings should not be here, they should be in target-specific | 3980 # settings should not be here, they should be in target-specific |
| 3976 # xcode_settings sections, or better yet, should use non-Xcode-specific | 3981 # xcode_settings sections, or better yet, should use non-Xcode-specific |
| 3977 # settings in target dicts. SYMROOT is a special case, because many other | 3982 # settings in target dicts. SYMROOT is a special case, because many other |
| 3978 # Xcode variables depend on it, including variables such as | 3983 # Xcode variables depend on it, including variables such as |
| 3979 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3984 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3980 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3985 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3981 # files to appear (when present) in the UI as actual files and not red | 3986 # files to appear (when present) in the UI as actual files and not red |
| 3982 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3987 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3983 # and therefore SYMROOT, needs to be set at the project level. | 3988 # and therefore SYMROOT, needs to be set at the project level. |
| 3984 'SYMROOT': '<(DEPTH)/xcodebuild', | 3989 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3985 }, | 3990 }, |
| 3986 } | 3991 } |
| OLD | NEW |