diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-15 20:26:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-15 20:26:52 +0000 |
| commit | b16e7b826e73023dd099441839467adfc9200265 (patch) | |
| tree | 0571fedc9bc2b9fdee6feba9a368eb330242fac8 | |
| parent | b96169dc7d1e92db027b947b18a95ffc5a0ab434 (diff) | |
| parent | 406fc1eaee3ad994b32399b1ed45983aca72e71a (diff) | |
| download | compiler-rt-b16e7b826e73023dd099441839467adfc9200265.tar.gz | |
Merge "Switch RenderScript's compiler-rt to existing unwinders." am: 14e0b71fff am: fee4ccc59a am: 406fc1eaee
Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/1551194
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I693a70d0fc657406687c997fdb61a301916e5e9b
| -rw-r--r-- | Android.bp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Android.bp b/Android.bp index 31ef8726b..c9a24833e 100644 --- a/Android.bp +++ b/Android.bp @@ -370,20 +370,17 @@ cc_library { 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, |