aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Prichard <rprichard@google.com>2021-01-19 17:18:31 -0800
committerRyan Prichard <rprichard@google.com>2021-01-19 19:29:43 -0800
commit9e179830545c8cc7547e601d4d3ac6650d73980b (patch)
tree1022134e5e937090e1b9022aaab944dc0b687053
parent14e0b71fffd0243a2bfc7e10e43b88d19e33f2e8 (diff)
downloadcompiler-rt-9e179830545c8cc7547e601d4d3ac6650d73980b.tar.gz
Switch libcompiler_rt to the LLVM prebuilt libunwind
Bug: http://b/153025717 Test: atest CtsRenderscriptTestCases Change-Id: Iae35fc183b172a395a25450b74b754e02f996c86
-rw-r--r--Android.bp16
1 files changed, 2 insertions, 14 deletions
diff --git a/Android.bp b/Android.bp
index c9a24833e..7e4fb1acb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -364,23 +364,11 @@ cc_library {
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,