| 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 4099 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4110 'MEMORY_SANITIZER_INITIAL_SIZE', | 4110 'MEMORY_SANITIZER_INITIAL_SIZE', |
| 4111 ], | 4111 ], |
| 4112 }], | 4112 }], |
| 4113 ], | 4113 ], |
| 4114 }], | 4114 }], |
| 4115 ['asan==1', { | 4115 ['asan==1', { |
| 4116 'target_conditions': [ | 4116 'target_conditions': [ |
| 4117 ['_toolset=="target"', { | 4117 ['_toolset=="target"', { |
| 4118 'cflags': [ | 4118 'cflags': [ |
| 4119 '-fsanitize=address', | 4119 '-fsanitize=address', |
| 4120 '-fsanitize-blacklist=<(asan_blacklist)', | 4120 # TODO(earthdok): Re-enable. http://crbug.com/427202 |
| 4121 #'-fsanitize-blacklist=<(asan_blacklist)', |
| 4121 ], | 4122 ], |
| 4122 'ldflags': [ | 4123 'ldflags': [ |
| 4123 '-fsanitize=address', | 4124 '-fsanitize=address', |
| 4124 ], | 4125 ], |
| 4125 }], | 4126 }], |
| 4126 ], | 4127 ], |
| 4127 'conditions': [ | 4128 'conditions': [ |
| 4128 ['OS=="mac"', { | 4129 ['OS=="mac"', { |
| 4129 'cflags': [ | 4130 'cflags': [ |
| 4130 '-mllvm -asan-globals=0', # http://crbug.com/352073 | 4131 '-mllvm -asan-globals=0', # http://crbug.com/352073 |
| (...skipping 1707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5838 # settings in target dicts. SYMROOT is a special case, because many other | 5839 # settings in target dicts. SYMROOT is a special case, because many other |
| 5839 # Xcode variables depend on it, including variables such as | 5840 # Xcode variables depend on it, including variables such as |
| 5840 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5841 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5841 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5842 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5842 # files to appear (when present) in the UI as actual files and not red | 5843 # files to appear (when present) in the UI as actual files and not red |
| 5843 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5844 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5844 # and therefore SYMROOT, needs to be set at the project level. | 5845 # and therefore SYMROOT, needs to be set at the project level. |
| 5845 'SYMROOT': '<(DEPTH)/xcodebuild', | 5846 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5846 }, | 5847 }, |
| 5847 } | 5848 } |
| OLD | NEW |