| 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 5141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5152 }, | 5152 }, |
| 5153 ], # postbuilds | 5153 ], # postbuilds |
| 5154 }], # mac_real_dsym | 5154 }], # mac_real_dsym |
| 5155 ], # target_conditions | 5155 ], # target_conditions |
| 5156 }], # (_type=="executable" or _type=="shared_library" or | 5156 }], # (_type=="executable" or _type=="shared_library" or |
| 5157 # _type=="loadable_module") and mac_strip!=0 | 5157 # _type=="loadable_module") and mac_strip!=0 |
| 5158 ], # target_conditions | 5158 ], # target_conditions |
| 5159 }, # target_defaults | 5159 }, # target_defaults |
| 5160 }], # OS=="mac" | 5160 }], # OS=="mac" |
| 5161 ['OS=="ios"', { | 5161 ['OS=="ios"', { |
| 5162 'includes': [ |
| 5163 'ios/coverage.gypi', |
| 5164 ], |
| 5162 'target_defaults': { | 5165 'target_defaults': { |
| 5163 'xcode_settings' : { | 5166 'xcode_settings' : { |
| 5164 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', | 5167 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', |
| 5165 | 5168 |
| 5166 'conditions': [ | 5169 'conditions': [ |
| 5167 # Older Xcodes do not support -Wno-deprecated-register, so pass an | 5170 # Older Xcodes do not support -Wno-deprecated-register, so pass an |
| 5168 # additional flag to suppress the "unknown compiler option" error. | 5171 # additional flag to suppress the "unknown compiler option" error. |
| 5169 # Restrict this flag to builds that are either compiling with Xcode | 5172 # Restrict this flag to builds that are either compiling with Xcode |
| 5170 # or compiling with Xcode's Clang. This will allow Ninja builds to | 5173 # or compiling with Xcode's Clang. This will allow Ninja builds to |
| 5171 # continue failing on unknown compiler options. | 5174 # continue failing on unknown compiler options. |
| (...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5864 # settings in target dicts. SYMROOT is a special case, because many other | 5867 # settings in target dicts. SYMROOT is a special case, because many other |
| 5865 # Xcode variables depend on it, including variables such as | 5868 # Xcode variables depend on it, including variables such as |
| 5866 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5869 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5867 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5870 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5868 # files to appear (when present) in the UI as actual files and not red | 5871 # files to appear (when present) in the UI as actual files and not red |
| 5869 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5872 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5870 # and therefore SYMROOT, needs to be set at the project level. | 5873 # and therefore SYMROOT, needs to be set at the project level. |
| 5871 'SYMROOT': '<(DEPTH)/xcodebuild', | 5874 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5872 }, | 5875 }, |
| 5873 } | 5876 } |
| OLD | NEW |