commit 99f6b86733e995bda177948462ae1260689355ea
author Colin Cross <ccross@android.com> Fri Aug 26 11:12:38 2016 -0700
committer Colin Cross <ccross@android.com> Fri Aug 26 11:12:38 2016 -0700
tree d539b3d45908f578677b4de873bba8d592ab3f62
parent 3a07e5bf94a88287d031f258a2a0af0590ce0d74

Replace libziparchive-host with libziparchive

libziparchive-host is no longer necessary, and mixing libziparchive-host
and libziparchive can cause ODR violations.

Change-Id: I27b2cc9974000ee7bf1d1ac15fd7b069862d9b01

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 \