Commit 6e2f3e26 authored by timurrrr's avatar timurrrr Committed by Commit bot

Add GYP dependencies for the ASan RTL in the component build mode

BUG=345874
NOTRY=true

Review URL: https://codereview.chromium.org/517383003

Cr-Commit-Position: refs/heads/master@{#292655}
parent baa762fc
...@@ -2504,6 +2504,11 @@ ...@@ -2504,6 +2504,11 @@
'<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime',
], ],
}], }],
['OS=="win" and asan==1 and component=="shared_library"', {
'dependencies': [
'<(DEPTH)/build/win/asan.gyp:asan_dynamic_runtime',
],
}],
['OS=="linux" and use_allocator!="none" and clang_type_profiler==1', { ['OS=="linux" and use_allocator!="none" and clang_type_profiler==1', {
'cflags_cc!': ['-fno-rtti'], 'cflags_cc!': ['-fno-rtti'],
'cflags_cc+': [ 'cflags_cc+': [
...@@ -5523,14 +5528,22 @@ ...@@ -5523,14 +5528,22 @@
], ],
}, },
'target_conditions': [ 'target_conditions': [
['_type=="executable"', { ['component=="shared_library"', {
'VCLinkerTool': {
'AdditionalDependencies': [
'clang_rt.asan_dynamic-i386.lib',
'clang_rt.asan_uar_thunk-i386.lib',
],
},
}],
['_type=="executable" and component=="static_library"', {
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalDependencies': [ 'AdditionalDependencies': [
'clang_rt.asan-i386.lib', 'clang_rt.asan-i386.lib',
], ],
}, },
}], }],
['_type=="shared_library" or _type=="loadable_module"', { ['(_type=="shared_library" or _type=="loadable_module") and component=="static_library"', {
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalDependencies': [ 'AdditionalDependencies': [
'clang_rt.asan_dll_thunk-i386.lib', 'clang_rt.asan_dll_thunk-i386.lib',
......
# Copyright (c) 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'targets': [
{
'target_name': 'asan_dynamic_runtime',
'type': 'none',
'variables': {
# Every target is going to depend on asan_dynamic_runtime, so allow
# this one to depend on itself.
'prune_self_dependency': 1,
},
'conditions': [
['OS=="win"', {
'copies': [
{
'destination': '<(PRODUCT_DIR)',
'files': [
# Path is relative to this GYP file.
'<(DEPTH)/<(make_clang_dir)/bin/clang_rt.asan_dynamic-i386.dll',
],
},
],
}],
],
},
],
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment