Index: build/config/android/BUILD.gn |
diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn |
index 8343861ab103a02cec8cde5e940b3994a2098f62..f8c78d61a2b51227fa372b782718b17b4b494732 100644 |
--- a/build/config/android/BUILD.gn |
+++ b/build/config/android/BUILD.gn |
@@ -114,13 +114,7 @@ config("runtime_library") { |
lib_dirs = [ android_libcpp_lib_dir ] |
# The libc++ runtime library (must come first). |
- # 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" ] |
- } |
+ libs = [ "c++" ] |
agrieve
2016/09/03 00:22:01
curious why this is safe to change?
jbudorick
2016/09/03 18:41:01
Turns out it isn't :(
r12 seems to have split the
|
# Manually link the libgcc.a that the cross compiler uses. This is |
# absolute because the linker will look inside the sysroot if it's not. |