| 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 5955 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5966 ['cfi_vptr==1', { | 5966 ['cfi_vptr==1', { |
| 5967 'target_defaults': { | 5967 'target_defaults': { |
| 5968 'target_conditions': [ | 5968 'target_conditions': [ |
| 5969 ['_toolset=="target"', { | 5969 ['_toolset=="target"', { |
| 5970 'cflags': [ | 5970 'cflags': [ |
| 5971 '-fsanitize=cfi-vptr', | 5971 '-fsanitize=cfi-vptr', |
| 5972 ], | 5972 ], |
| 5973 'ldflags': [ | 5973 'ldflags': [ |
| 5974 '-fsanitize=cfi-vptr', | 5974 '-fsanitize=cfi-vptr', |
| 5975 ], | 5975 ], |
| 5976 'xcode_settings': { |
| 5977 'OTHER_CFLAGS': [ |
| 5978 '-fsanitize=cfi-vptr', |
| 5979 ], |
| 5980 }, |
| 5981 }], |
| 5982 ['_toolset=="target" and _type!="static_library"', { |
| 5983 'xcode_settings': { |
| 5984 'OTHER_LDFLAGS': [ |
| 5985 '-fsanitize=cfi-vptr', |
| 5986 ], |
| 5987 }, |
| 5976 }], | 5988 }], |
| 5977 ], | 5989 ], |
| 5978 }, | 5990 }, |
| 5979 }], | 5991 }], |
| 5980 ], | 5992 ], |
| 5981 'xcode_settings': { | 5993 'xcode_settings': { |
| 5982 # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT! | 5994 # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT! |
| 5983 # This block adds *project-wide* configuration settings to each project | 5995 # This block adds *project-wide* configuration settings to each project |
| 5984 # file. It's almost always wrong to put things here. Specify your | 5996 # file. It's almost always wrong to put things here. Specify your |
| 5985 # custom xcode_settings in target_defaults to add them to targets instead. | 5997 # custom xcode_settings in target_defaults to add them to targets instead. |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6040 # settings in target dicts. SYMROOT is a special case, because many other | 6052 # settings in target dicts. SYMROOT is a special case, because many other |
| 6041 # Xcode variables depend on it, including variables such as | 6053 # Xcode variables depend on it, including variables such as |
| 6042 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6054 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6043 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6055 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6044 # files to appear (when present) in the UI as actual files and not red | 6056 # files to appear (when present) in the UI as actual files and not red |
| 6045 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6057 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6046 # and therefore SYMROOT, needs to be set at the project level. | 6058 # and therefore SYMROOT, needs to be set at the project level. |
| 6047 'SYMROOT': '<(DEPTH)/xcodebuild', | 6059 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6048 }, | 6060 }, |
| 6049 } | 6061 } |
| OLD | NEW |