aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Prichard <rprichard@google.com>2020-06-09 23:58:59 -0700
committerRyan Prichard <rprichard@google.com>2020-06-19 22:38:34 +0000
commit2674521dff29c84e9b37b28243fdaf9ca24620cd (patch)
treeb6315f259163e49ed265f7e2e18fc6e58fb71825
parent6860a68a2000d8a47d7f8157f7521461aa96f95d (diff)
downloadlibunwind-2674521dff29c84e9b37b28243fdaf9ca24620cd.tar.gz
Rename libunwind -> libunwind_sharedandroid-r-beta-3android-r-beta-2
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)
-rw-r--r--Android.bp4
1 files 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"],
}
/*