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

Issues Search
    My Issues | Starred     Open | Closed | All

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: rebase: rerun all CQ bots 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 | « build/android/adb_gdb ('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..c0f89212e3f8815358dda2a90b9bb261373fabbe 100644
--- a/build/config/android/BUILD.gn
+++ b/build/config/android/BUILD.gn
@@ -121,6 +121,15 @@ config("runtime_library") {
} else {
libs = [ "c++_static" ]
}
+ libs += [
+ "c++abi",
+ "android_support",
+ ]
+
+ # arm builds of libc++ starting in NDK r12 depend on unwind.
+ if (current_cpu == "arm") {
+ libs += [ "unwind" ]
+ }
# 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 | « build/android/adb_gdb ('k') | build/config/android/config.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698