| 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 2486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2497 ], | 2497 ], |
| 2498 'include_dirs': [ | 2498 'include_dirs': [ |
| 2499 '<(SHARED_INTERMEDIATE_DIR)', | 2499 '<(SHARED_INTERMEDIATE_DIR)', |
| 2500 ], | 2500 ], |
| 2501 'conditions': [ | 2501 'conditions': [ |
| 2502 ['(OS=="mac" or OS=="ios") and asan==1', { | 2502 ['(OS=="mac" or OS=="ios") and asan==1', { |
| 2503 'dependencies': [ | 2503 'dependencies': [ |
| 2504 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', | 2504 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', |
| 2505 ], | 2505 ], |
| 2506 }], | 2506 }], |
| 2507 ['OS=="win" and asan==1 and component=="shared_library"', { |
| 2508 'dependencies': [ |
| 2509 '<(DEPTH)/build/win/asan.gyp:asan_dynamic_runtime', |
| 2510 ], |
| 2511 }], |
| 2507 ['OS=="linux" and use_allocator!="none" and clang_type_profiler==1', { | 2512 ['OS=="linux" and use_allocator!="none" and clang_type_profiler==1', { |
| 2508 'cflags_cc!': ['-fno-rtti'], | 2513 'cflags_cc!': ['-fno-rtti'], |
| 2509 'cflags_cc+': [ | 2514 'cflags_cc+': [ |
| 2510 '-frtti', | 2515 '-frtti', |
| 2511 '-gline-tables-only', | 2516 '-gline-tables-only', |
| 2512 '-fintercept-allocation-functions', | 2517 '-fintercept-allocation-functions', |
| 2513 ], | 2518 ], |
| 2514 'defines': ['TYPE_PROFILING'], | 2519 'defines': ['TYPE_PROFILING'], |
| 2515 'dependencies': [ | 2520 'dependencies': [ |
| 2516 '<(DEPTH)/base/allocator/allocator.gyp:type_profiler', | 2521 '<(DEPTH)/base/allocator/allocator.gyp:type_profiler', |
| (...skipping 2999 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5516 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.6.0/include_sanitizer'
, | 5521 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.6.0/include_sanitizer'
, |
| 5517 ], | 5522 ], |
| 5518 }, | 5523 }, |
| 5519 'VCLinkerTool': { | 5524 'VCLinkerTool': { |
| 5520 'AdditionalLibraryDirectories': [ | 5525 'AdditionalLibraryDirectories': [ |
| 5521 # TODO(hans): If make_clang_dir is absolute, this breaks. | 5526 # TODO(hans): If make_clang_dir is absolute, this breaks. |
| 5522 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.6.0/lib/windows', | 5527 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.6.0/lib/windows', |
| 5523 ], | 5528 ], |
| 5524 }, | 5529 }, |
| 5525 'target_conditions': [ | 5530 'target_conditions': [ |
| 5526 ['_type=="executable"', { | 5531 ['component=="shared_library"', { |
| 5532 'VCLinkerTool': { |
| 5533 'AdditionalDependencies': [ |
| 5534 'clang_rt.asan_dynamic-i386.lib', |
| 5535 'clang_rt.asan_uar_thunk-i386.lib', |
| 5536 ], |
| 5537 }, |
| 5538 }], |
| 5539 ['_type=="executable" and component=="static_library"', { |
| 5527 'VCLinkerTool': { | 5540 'VCLinkerTool': { |
| 5528 'AdditionalDependencies': [ | 5541 'AdditionalDependencies': [ |
| 5529 'clang_rt.asan-i386.lib', | 5542 'clang_rt.asan-i386.lib', |
| 5530 ], | 5543 ], |
| 5531 }, | 5544 }, |
| 5532 }], | 5545 }], |
| 5533 ['_type=="shared_library" or _type=="loadable_module"', { | 5546 ['(_type=="shared_library" or _type=="loadable_module") and comp
onent=="static_library"', { |
| 5534 'VCLinkerTool': { | 5547 'VCLinkerTool': { |
| 5535 'AdditionalDependencies': [ | 5548 'AdditionalDependencies': [ |
| 5536 'clang_rt.asan_dll_thunk-i386.lib', | 5549 'clang_rt.asan_dll_thunk-i386.lib', |
| 5537 ], | 5550 ], |
| 5538 }, | 5551 }, |
| 5539 }], | 5552 }], |
| 5540 ], | 5553 ], |
| 5541 }], | 5554 }], |
| 5542 ], | 5555 ], |
| 5543 }, | 5556 }, |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5753 # settings in target dicts. SYMROOT is a special case, because many other | 5766 # settings in target dicts. SYMROOT is a special case, because many other |
| 5754 # Xcode variables depend on it, including variables such as | 5767 # Xcode variables depend on it, including variables such as |
| 5755 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5768 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5756 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5769 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5757 # files to appear (when present) in the UI as actual files and not red | 5770 # files to appear (when present) in the UI as actual files and not red |
| 5758 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5771 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5759 # and therefore SYMROOT, needs to be set at the project level. | 5772 # and therefore SYMROOT, needs to be set at the project level. |
| 5760 'SYMROOT': '<(DEPTH)/xcodebuild', | 5773 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5761 }, | 5774 }, |
| 5762 } | 5775 } |
| OLD | NEW |