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

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

Issue 2193943002: [Android] Roll to NDK r12b. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge recursedeps Created 4 years, 3 months 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 | « DEPS ('k') | build/config/android/config.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 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.
« no previous file with comments | « DEPS ('k') | build/config/android/config.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698