Merge "Switch RenderScript's compiler-rt to existing unwinders." am: 14e0b71fff am: fee4ccc59a
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1551194
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib25b6b9e40985dac9a58e835adfb4f4f16e881ed
diff --git a/Android.bp b/Android.bp
index 31ef872..c9a2483 100644
--- a/Android.bp
+++ b/Android.bp
@@ -370,20 +370,17 @@
ldflags: ["-Wl,--exclude-libs,libunwind_llvm.a"],
},
android_arm64: {
- static_libs: ["libunwindbacktrace", "libunwind_static"],
- ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],
+ static_libs: ["libgcc_stripped"],
+ ldflags: ["-Wl,--exclude-libs,libgcc_stripped.a"],
},
android_x86: {
- static_libs: ["libunwindbacktrace", "libunwind_static"],
- ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],
+ static_libs: ["libgcc_stripped"],
+ ldflags: ["-Wl,--exclude-libs,libgcc_stripped.a"],
},
android_x86_64: {
srcs: ["lib/builtins/ppc/floatditf.c"],
- static_libs: ["libunwindbacktrace", "libunwind_static"],
- ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a:libunwind.a"],
- },
- linux_glibc: {
- static_libs: ["libunwindbacktrace", "libunwind_static"],
+ static_libs: ["libgcc_stripped"],
+ ldflags: ["-Wl,--exclude-libs,libgcc_stripped.a"],
},
windows: {
enabled: true,
