| 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 5028 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5039 ['clang_xcode==1', { | 5039 ['clang_xcode==1', { |
| 5040 'WARNING_CFLAGS': [ | 5040 'WARNING_CFLAGS': [ |
| 5041 '-Wno-unknown-warning-option', | 5041 '-Wno-unknown-warning-option', |
| 5042 ], | 5042 ], |
| 5043 }], | 5043 }], |
| 5044 | 5044 |
| 5045 # Limit the valid architectures depending on "target_subarch". | 5045 # Limit the valid architectures depending on "target_subarch". |
| 5046 # This need to include the "arm" architectures but also the "x86" | 5046 # This need to include the "arm" architectures but also the "x86" |
| 5047 # ones (they are used when building for the simulator). | 5047 # ones (they are used when building for the simulator). |
| 5048 ['target_subarch=="arm32"', { | 5048 ['target_subarch=="arm32"', { |
| 5049 'VALID_ARCHS': ['armv7', 'i386'], | 5049 'VALID_ARCHS': ['armv7', 'armv7s', 'i386'], |
| 5050 }], | 5050 }], |
| 5051 ['target_subarch=="arm64"', { | 5051 ['target_subarch=="arm64"', { |
| 5052 'VALID_ARCHS': ['arm64', 'x86_64'], | 5052 'VALID_ARCHS': ['arm64', 'x86_64'], |
| 5053 }], | 5053 }], |
| 5054 ['target_subarch=="both"', { | 5054 ['target_subarch=="both"', { |
| 5055 'VALID_ARCHS': ['arm64', 'armv7', 'x86_64', 'i386'], | 5055 'VALID_ARCHS': ['arm64', 'armv7', 'armv7s', 'x86_64', 'i386'], |
| 5056 }], | 5056 }], |
| 5057 ['use_system_libcxx==1', { | 5057 ['use_system_libcxx==1', { |
| 5058 'target_conditions': [ | 5058 'target_conditions': [ |
| 5059 # Only use libc++ when building target for iOS not when building | 5059 # Only use libc++ when building target for iOS not when building |
| 5060 # tools for the host (OS X) as Mac targets OS X SDK 10.6 which | 5060 # tools for the host (OS X) as Mac targets OS X SDK 10.6 which |
| 5061 # does not support libc++. | 5061 # does not support libc++. |
| 5062 ['_toolset=="target"', { | 5062 ['_toolset=="target"', { |
| 5063 'CLANG_CXX_LIBRARY': 'libc++', # -stdlib=libc++ | 5063 'CLANG_CXX_LIBRARY': 'libc++', # -stdlib=libc++ |
| 5064 }] | 5064 }] |
| 5065 ], | 5065 ], |
| (...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5705 # settings in target dicts. SYMROOT is a special case, because many other | 5705 # settings in target dicts. SYMROOT is a special case, because many other |
| 5706 # Xcode variables depend on it, including variables such as | 5706 # Xcode variables depend on it, including variables such as |
| 5707 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5707 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5708 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5708 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5709 # files to appear (when present) in the UI as actual files and not red | 5709 # files to appear (when present) in the UI as actual files and not red |
| 5710 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5710 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5711 # and therefore SYMROOT, needs to be set at the project level. | 5711 # and therefore SYMROOT, needs to be set at the project level. |
| 5712 'SYMROOT': '<(DEPTH)/xcodebuild', | 5712 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5713 }, | 5713 }, |
| 5714 } | 5714 } |
| OLD | NEW |