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 6148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6159 'xcode_settings': { | 6159 'xcode_settings': { |
6160 'OTHER_LDFLAGS': [ | 6160 'OTHER_LDFLAGS': [ |
6161 '-fno-sanitize-trap=cfi', | 6161 '-fno-sanitize-trap=cfi', |
6162 '-fsanitize-recover=cfi', | 6162 '-fsanitize-recover=cfi', |
6163 ], | 6163 ], |
6164 }, | 6164 }, |
6165 }], | 6165 }], |
6166 ], | 6166 ], |
6167 }, | 6167 }, |
6168 }], | 6168 }], |
| 6169 ['cfi_vptr==1 and cfi_diag==0', { |
| 6170 'target_defaults': { |
| 6171 'target_conditions': [ |
| 6172 ['_toolset=="target"', { |
| 6173 'defines': [ |
| 6174 'CFI_ENFORCEMENT', |
| 6175 ], |
| 6176 }], |
| 6177 ], |
| 6178 }, |
| 6179 }], |
6169 ['cfi_vptr==1', { | 6180 ['cfi_vptr==1', { |
6170 'target_defaults': { | 6181 'target_defaults': { |
6171 'target_conditions': [ | 6182 'target_conditions': [ |
6172 ['_toolset=="target"', { | 6183 ['_toolset=="target"', { |
6173 'cflags': [ | 6184 'cflags': [ |
6174 '-fsanitize=cfi-vcall', | 6185 '-fsanitize=cfi-vcall', |
6175 '-fsanitize=cfi-derived-cast', | 6186 '-fsanitize=cfi-derived-cast', |
6176 '-fsanitize=cfi-unrelated-cast', | 6187 '-fsanitize=cfi-unrelated-cast', |
6177 '-fsanitize-blacklist=<(cfi_blacklist)', | 6188 '-fsanitize-blacklist=<(cfi_blacklist)', |
6178 ], | 6189 ], |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6275 # settings in target dicts. SYMROOT is a special case, because many other | 6286 # settings in target dicts. SYMROOT is a special case, because many other |
6276 # Xcode variables depend on it, including variables such as | 6287 # Xcode variables depend on it, including variables such as |
6277 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6288 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
6278 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6289 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
6279 # files to appear (when present) in the UI as actual files and not red | 6290 # files to appear (when present) in the UI as actual files and not red |
6280 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6291 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
6281 # and therefore SYMROOT, needs to be set at the project level. | 6292 # and therefore SYMROOT, needs to be set at the project level. |
6282 'SYMROOT': '<(DEPTH)/xcodebuild', | 6293 'SYMROOT': '<(DEPTH)/xcodebuild', |
6283 }, | 6294 }, |
6284 } | 6295 } |
OLD | NEW |