commit e4ef9417d6b15a1c7f7abfc66c71d5fabdd16650
author Colin Cross <ccross@android.com> Fri Aug 26 20:32:28 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 26 20:32:28 2016 +0000
tree 6401ab66333f4ea5de54f52ab4bc8364a798d03a
parent 756a700da9ad9b05f8ce2c7bfc95fcee0421dfd8
parent ae79dab7f6d503cbbd9d1fe3ca67c8e941640340

Merge "Replace libziparchive-host with libziparchive" am: 091b631915
am: 904c1042cd

Change-Id: I3e3a49fb45d5387af675e8d7b20974796d3ee962

fastboot/Android.mk

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 \

libbacktrace/Android.mk

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 \