Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: build/common.gypi

Issue 573743002: Roll ASan/Win to r217738 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | tools/clang/scripts/update.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 5540 matching lines...) Expand 10 before | Expand all | Expand 10 after
5551 'AdditionalLibraryDirectories': [ 5551 'AdditionalLibraryDirectories': [
5552 # TODO(hans): If make_clang_dir is absolute, this breaks. 5552 # TODO(hans): If make_clang_dir is absolute, this breaks.
5553 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.6.0/lib/windows', 5553 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.6.0/lib/windows',
5554 ], 5554 ],
5555 }, 5555 },
5556 'target_conditions': [ 5556 'target_conditions': [
5557 ['component=="shared_library"', { 5557 ['component=="shared_library"', {
5558 'VCLinkerTool': { 5558 'VCLinkerTool': {
5559 'AdditionalDependencies': [ 5559 'AdditionalDependencies': [
5560 'clang_rt.asan_dynamic-i386.lib', 5560 'clang_rt.asan_dynamic-i386.lib',
5561 'clang_rt.asan_uar_thunk-i386.lib', 5561 'clang_rt.asan_dynamic_runtime_thunk-i386.lib',
5562 ], 5562 ],
5563 }, 5563 },
5564 }], 5564 }],
5565 ['_type=="executable" and component=="static_library"', { 5565 ['_type=="executable" and component=="static_library"', {
5566 'VCLinkerTool': { 5566 'VCLinkerTool': {
5567 'AdditionalDependencies': [ 5567 'AdditionalDependencies': [
5568 'clang_rt.asan-i386.lib', 5568 'clang_rt.asan-i386.lib',
5569 ], 5569 ],
5570 }, 5570 },
5571 }], 5571 }],
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
5792 # settings in target dicts. SYMROOT is a special case, because many other 5792 # settings in target dicts. SYMROOT is a special case, because many other
5793 # Xcode variables depend on it, including variables such as 5793 # Xcode variables depend on it, including variables such as
5794 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5794 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5795 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5795 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5796 # files to appear (when present) in the UI as actual files and not red 5796 # files to appear (when present) in the UI as actual files and not red
5797 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5797 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5798 # and therefore SYMROOT, needs to be set at the project level. 5798 # and therefore SYMROOT, needs to be set at the project level.
5799 'SYMROOT': '<(DEPTH)/xcodebuild', 5799 'SYMROOT': '<(DEPTH)/xcodebuild',
5800 }, 5800 },
5801 } 5801 }
OLDNEW
« no previous file with comments | « no previous file | tools/clang/scripts/update.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698