Index: build/config/BUILDCONFIG.gn |
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn |
index 890d33e0659e0d0b9ed1bf41b5e572979742b177..533792c38c1e771b7c0c05668d18a0fd1c85ecb9 100644 |
--- a/build/config/BUILDCONFIG.gn |
+++ b/build/config/BUILDCONFIG.gn |
@@ -481,6 +481,12 @@ set_defaults("test") { |
} |
} |
+if (is_asan) { |
+ sanitizer_deps = [ "//build/sanitizers:options" ] |
brettw
2014/10/28 16:59:13
I think we would want this in a .gni file. But act
|
+} else { |
+ sanitizer_deps = [] |
+} |
+ |
# ============================================================================== |
# TOOLCHAIN SETUP |
@@ -568,7 +574,11 @@ template("component") { |
if (defined(invoker.data)) { data = invoker.data } |
if (defined(invoker.datadeps)) { datadeps = invoker.datadeps } |
if (defined(invoker.defines)) { defines = invoker.defines } |
- if (defined(invoker.deps)) { deps = invoker.deps } |
+ if (defined(invoker.deps)) { |
+ deps = invoker.deps + sanitizer_deps |
+ } else { |
+ deps = sanitizer_deps |
+ } |
if (defined(invoker.direct_dependent_configs)) { direct_dependent_configs = invoker.direct_dependent_configs } |
if (defined(invoker.forward_dependent_configs_from)) { forward_dependent_configs_from = invoker.forward_dependent_configs_from } |
if (defined(invoker.include_dirs)) { include_dirs = invoker.include_dirs } |
@@ -691,7 +701,11 @@ template("test") { |
if (defined(invoker.data)) { data = invoker.data } |
if (defined(invoker.datadeps)) { datadeps = invoker.datadeps } |
if (defined(invoker.defines)) { defines = invoker.defines } |
- if (defined(invoker.deps)) { deps = invoker.deps } |
+ if (defined(invoker.deps)) { |
+ deps = invoker.deps + sanitizer_deps |
+ } else { |
+ deps = sanitizer_deps |
+ } |
if (defined(invoker.direct_dependent_configs)) { direct_dependent_configs = invoker.direct_dependent_configs } |
if (defined(invoker.forward_dependent_configs_from)) { forward_dependent_configs_from = invoker.forward_dependent_configs_from } |
if (defined(invoker.include_dirs)) { include_dirs = invoker.include_dirs } |