From 2674521dff29c84e9b37b28243fdaf9ca24620cd Mon Sep 17 00:00:00 2001 From: Ryan Prichard Date: Tue, 9 Jun 2020 23:58:59 -0700 Subject: Rename libunwind -> libunwind_shared The LLVM build system produces a libunwind.a, and the Clang driver links its libunwind.a automatically when -nostdlib isn't passed. I'd like to keep the libunwind.a name, but adding a Soong prebuilt module of name "libunwind" conflicts with the external/libunwind module that practically no one is using. Fix the conflict by renaming libunwind to libunwind_shared, and removing unnecessary uses of the old module. (Code should use libunwindstack.so to collect backtraces, and it should use libc.so's _Unwind_* APIs for C++ exception handling unwinding.) Test: build Android Change-Id: Idc4e5fca7f0a4b2dc59493b3956787b841662f9f Merged-In: Idc4e5fca7f0a4b2dc59493b3956787b841662f9f (cherry picked from commit 7bfc066a96945e78fee43b104815dcf5165b067c) --- Android.bp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.bp b/Android.bp index b63a44bd..6f0a4eb9 100644 --- a/Android.bp +++ b/Android.bp @@ -335,7 +335,7 @@ cc_defaults { } cc_library_shared { - name: "libunwind", + name: "libunwind_shared", defaults: ["libunwind_core_defaults"], } @@ -403,7 +403,7 @@ cc_test { ], local_include_dirs: ["include"], - shared_libs: ["libunwind"], + shared_libs: ["libunwind_shared"], } /* -- cgit v1.2.3