Chromium Code Reviews| 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 5520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5531 # See crbug.com/345874. | 5531 # See crbug.com/345874. |
| 5532 'VCCLCompilerTool': { | 5532 'VCCLCompilerTool': { |
| 5533 'AdditionalOptions': [ | 5533 'AdditionalOptions': [ |
| 5534 '-fsanitize=address', | 5534 '-fsanitize=address', |
| 5535 ], | 5535 ], |
| 5536 'AdditionalIncludeDirectories': [ | 5536 'AdditionalIncludeDirectories': [ |
| 5537 # MSVC needs to be able to find the sanitizer headers when | 5537 # MSVC needs to be able to find the sanitizer headers when |
| 5538 # invoked via /fallback. This is critical for using macros | 5538 # invoked via /fallback. This is critical for using macros |
| 5539 # like ASAN_UNPOISON_MEMORY_REGION in files where we fall | 5539 # like ASAN_UNPOISON_MEMORY_REGION in files where we fall |
| 5540 # back. | 5540 # back. |
| 5541 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.6.0/include_sanitizer' , | 5541 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.7.0/include_sanitizer' , |
| 5542 ], | 5542 ], |
| 5543 }, | 5543 }, |
| 5544 'VCLinkerTool': { | 5544 'VCLinkerTool': { |
| 5545 'AdditionalLibraryDirectories': [ | 5545 'AdditionalLibraryDirectories': [ |
| 5546 # TODO(hans): If make_clang_dir is absolute, this breaks. | 5546 # TODO(hans): If make_clang_dir is absolute, this breaks. |
| 5547 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.6.0/lib/windows', | 5547 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.7.0/lib/windows', |
|
Timur Iskhodzhanov
2015/01/27 13:27:55
For the record, turns out I've forgotten to update
| |
| 5548 ], | 5548 ], |
| 5549 }, | 5549 }, |
| 5550 'target_conditions': [ | 5550 'target_conditions': [ |
| 5551 ['component=="shared_library"', { | 5551 ['component=="shared_library"', { |
| 5552 'VCLinkerTool': { | 5552 'VCLinkerTool': { |
| 5553 'AdditionalDependencies': [ | 5553 'AdditionalDependencies': [ |
| 5554 'clang_rt.asan_dynamic-i386.lib', | 5554 'clang_rt.asan_dynamic-i386.lib', |
| 5555 'clang_rt.asan_dynamic_runtime_thunk-i386.lib', | 5555 'clang_rt.asan_dynamic_runtime_thunk-i386.lib', |
| 5556 ], | 5556 ], |
| 5557 }, | 5557 }, |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5841 # settings in target dicts. SYMROOT is a special case, because many other | 5841 # settings in target dicts. SYMROOT is a special case, because many other |
| 5842 # Xcode variables depend on it, including variables such as | 5842 # Xcode variables depend on it, including variables such as |
| 5843 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5843 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5844 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5844 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5845 # files to appear (when present) in the UI as actual files and not red | 5845 # files to appear (when present) in the UI as actual files and not red |
| 5846 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5846 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5847 # and therefore SYMROOT, needs to be set at the project level. | 5847 # and therefore SYMROOT, needs to be set at the project level. |
| 5848 'SYMROOT': '<(DEPTH)/xcodebuild', | 5848 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5849 }, | 5849 }, |
| 5850 } | 5850 } |
| OLD | NEW |