Merge "Switch libcompiler_rt to the LLVM prebuilt libunwind" am: 1eda370e3c
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1554717
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7f70a5460b2f764b6a44bafb539cfb3bc4c4d880
diff --git a/Android.bp b/Android.bp
index c9a2483..7e4fb1a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -364,23 +364,11 @@
target: {
android: {
shared_libs: ["liblog"],
- },
- android_arm: {
- static_libs: ["libunwind_llvm"],
- ldflags: ["-Wl,--exclude-libs,libunwind_llvm.a"],
- },
- android_arm64: {
- static_libs: ["libgcc_stripped"],
- ldflags: ["-Wl,--exclude-libs,libgcc_stripped.a"],
- },
- android_x86: {
- static_libs: ["libgcc_stripped"],
- ldflags: ["-Wl,--exclude-libs,libgcc_stripped.a"],
+ static_libs: ["libunwind"],
+ ldflags: ["-Wl,--exclude-libs,libunwind.a"],
},
android_x86_64: {
srcs: ["lib/builtins/ppc/floatditf.c"],
- static_libs: ["libgcc_stripped"],
- ldflags: ["-Wl,--exclude-libs,libgcc_stripped.a"],
},
windows: {
enabled: true,
