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

Unified Diff: build/config/android/BUILD.gn

Issue 1496283003: Port android_must_copy_system_libraries logic GYP->GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/android/linker/config.gni ('k') | build/config/android/rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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" ]
« no previous file with comments | « base/android/linker/config.gni ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698