Replace libziparchive-host with libziparchive
libziparchive-host is no longer necessary, and mixing libziparchive-host
and libziparchive can cause ODR violations.
Change-Id: I27b2cc9974000ee7bf1d1ac15fd7b069862d9b01
diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index 1b4ecbe..28e3d4b 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -58,7 +58,7 @@
LOCAL_C_INCLUDES_windows := development/host/windows/usb/api
LOCAL_STATIC_LIBRARIES := \
- libziparchive-host \
+ libziparchive \
libext4_utils_host \
libsparse_host \
libutils \
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 9bb113a..56a3970 100644
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -67,7 +67,7 @@
libbacktrace_offline_static_libraries_host := \
libbacktrace \
libunwind \
- libziparchive-host \
+ libziparchive \
libz \
libbase \
liblog \
@@ -129,7 +129,7 @@
libz \
backtrace_test_static_libraries_host := \
- libziparchive-host \
+ libziparchive \
libz \
libutils \
libLLVMObject \
