diff options
| author | Ryan Prichard <rprichard@google.com> | 2021-01-21 01:19:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-21 01:19:51 +0000 |
| commit | 71f8f5e1096a9ec86054ae493d6a99b8535621e8 (patch) | |
| tree | 1022134e5e937090e1b9022aaab944dc0b687053 | |
| parent | b16e7b826e73023dd099441839467adfc9200265 (diff) | |
| parent | e6a52b1fb00d6e1936c38627dcd0d6eff286fb57 (diff) | |
| download | compiler-rt-71f8f5e1096a9ec86054ae493d6a99b8535621e8.tar.gz | |
Merge "Switch libcompiler_rt to the LLVM prebuilt libunwind" am: 1eda370e3c am: ec51602b49 am: e6a52b1fb0
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1554717
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id2196a502ff6eefb014fc9b64e2b07fcefe22d5e
| -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, |