| 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 4536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4547 }, { | 4547 }, { |
| 4548 'SDKROOT': 'iphoneos<(ios_sdk)', # -isysroot | 4548 'SDKROOT': 'iphoneos<(ios_sdk)', # -isysroot |
| 4549 }], | 4549 }], |
| 4550 ], | 4550 ], |
| 4551 }, { | 4551 }, { |
| 4552 'SDKROOT': '<(ios_sdk_path)', # -isysroot | 4552 'SDKROOT': '<(ios_sdk_path)', # -isysroot |
| 4553 }], | 4553 }], |
| 4554 ], | 4554 ], |
| 4555 }], | 4555 }], |
| 4556 ['OS=="ios"', { | 4556 ['OS=="ios"', { |
| 4557 'ARCHS': '$(ARCHS_UNIVERSAL_IPHONE_OS)', | |
| 4558 # Just build armv7, until armv7s is correctly tested. | 4557 # Just build armv7, until armv7s is correctly tested. |
| 4559 'VALID_ARCHS': 'armv7 i386', | 4558 'VALID_ARCHS': 'armv7 i386', |
| 4560 # Target both iPhone and iPad. | 4559 # Target both iPhone and iPad. |
| 4561 'TARGETED_DEVICE_FAMILY': '1,2', | 4560 'TARGETED_DEVICE_FAMILY': '1,2', |
| 4562 }], | 4561 }], |
| 4563 ['target_arch=="x64"', { | 4562 ['target_arch=="x64"', { |
| 4564 'ARCHS': [ | 4563 'ARCHS': [ |
| 4565 'x86_64' | 4564 'x86_64' |
| 4566 ], | 4565 ], |
| 4567 }], | 4566 }], |
| 4568 ], | 4567 ], |
| 4569 | 4568 |
| 4570 # The Xcode generator will look for an xcode_settings section at the root | 4569 # The Xcode generator will look for an xcode_settings section at the root |
| 4571 # of each dict and use it to apply settings on a file-wide basis. Most | 4570 # of each dict and use it to apply settings on a file-wide basis. Most |
| 4572 # settings should not be here, they should be in target-specific | 4571 # settings should not be here, they should be in target-specific |
| 4573 # xcode_settings sections, or better yet, should use non-Xcode-specific | 4572 # xcode_settings sections, or better yet, should use non-Xcode-specific |
| 4574 # settings in target dicts. SYMROOT is a special case, because many other | 4573 # settings in target dicts. SYMROOT is a special case, because many other |
| 4575 # Xcode variables depend on it, including variables such as | 4574 # Xcode variables depend on it, including variables such as |
| 4576 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4575 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4577 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4576 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4578 # files to appear (when present) in the UI as actual files and not red | 4577 # files to appear (when present) in the UI as actual files and not red |
| 4579 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4578 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4580 # and therefore SYMROOT, needs to be set at the project level. | 4579 # and therefore SYMROOT, needs to be set at the project level. |
| 4581 'SYMROOT': '<(DEPTH)/xcodebuild', | 4580 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4582 }, | 4581 }, |
| 4583 } | 4582 } |
| OLD | NEW |