diff options
author | Ryan Prichard <rprichard@google.com> | 2021-01-20 23:09:04 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-20 23:09:04 +0000 |
commit | 1eda370e3c735e969bfe3b6f3123302155b63c0c (patch) | |
tree | 1022134e5e937090e1b9022aaab944dc0b687053 | |
parent | 14e0b71fffd0243a2bfc7e10e43b88d19e33f2e8 (diff) | |
parent | 9e179830545c8cc7547e601d4d3ac6650d73980b (diff) | |
download | compiler-rt-1eda370e3c735e969bfe3b6f3123302155b63c0c.tar.gz |
Merge "Switch libcompiler_rt to the LLVM prebuilt libunwind"
-rw-r--r-- | Android.bp | 16 |
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, |