| Index: build/config/android/BUILD.gn
|
| diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
|
| index cfbde79dbc54b597ff43b28b277994a17b4afa67..fe3897ca35b8d33e988dbebe4473a6632b87a863 100644
|
| --- a/build/config/android/BUILD.gn
|
| +++ b/build/config/android/BUILD.gn
|
| @@ -145,7 +145,9 @@ config("runtime_library") {
|
| lib_dirs = [ "$android_libcpp_root/libs/$android_app_abi" ]
|
|
|
| # The libc++ runtime library (must come first).
|
| - if (is_component_build) {
|
| + # ASan needs to dynamically link to libc++ even in static builds so
|
| + # that it can interpose operator new.
|
| + if (is_component_build || is_asan) {
|
| libs = [ "c++_shared" ]
|
| } else {
|
| libs = [ "c++_static" ]
|
|
|