| Index: build/config/BUILDCONFIG.gn
|
| diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
|
| index 890d33e0659e0d0b9ed1bf41b5e572979742b177..151b8e9623f631c70f7e7b95f22df6ce70b06eb1 100644
|
| --- a/build/config/BUILDCONFIG.gn
|
| +++ b/build/config/BUILDCONFIG.gn
|
| @@ -568,7 +568,13 @@ 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 }
|
| + # All shared libraries must have the sanitizer deps to properly link in
|
| + # asan mode (this target will be empty in other cases).
|
| + if (defined(invoker.deps)) {
|
| + deps = invoker.deps + [ "//build/config/sanitizers:deps" ]
|
| + } else {
|
| + deps = [ "//build/config/sanitizers: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 +697,13 @@ 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 }
|
| + # All shared libraries must have the sanitizer deps to properly link in
|
| + # asan mode (this target will be empty in other cases).
|
| + if (defined(invoker.deps)) {
|
| + deps = invoker.deps + [ "//build/config/sanitizers:deps" ]
|
| + } else {
|
| + deps = [ "//build/config/sanitizers: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 }
|
|
|