commit 9a1a3bcb164d331480100bd815f3bd89230ff9bc
author Colin Cross <ccross@android.com> Fri Aug 26 11:15:17 2016 -0700
committer Colin Cross <ccross@android.com> Fri Aug 26 11:15:17 2016 -0700
tree d8ef53e61df3c2da9b332c7d145db1d99310ef0d
parent 0a357a1a7353dc93f6e0c03fbf242231232948d8

Replace libziparchive-host with libziparchive

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

Change-Id: I623c0c5579e28f26a6e1db7bd953f33ed1ca68cd

tools/aapt/Android.mk

diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 2a490d1..04f46d9 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -61,7 +61,7 @@
     liblog \
     libcutils \
     libexpat \
-    libziparchive-host \
+    libziparchive \
     libbase
 
 aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\"

tools/aapt2/Android.mk

diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk
index be2f88d..2e5fbdc 100644
--- a/tools/aapt2/Android.mk
+++ b/tools/aapt2/Android.mk
@@ -126,7 +126,7 @@
 	liblog \
 	libcutils \
 	libexpat \
-	libziparchive-host \
+	libziparchive \
 	libpng \
 	libbase \
 	libprotobuf-cpp-lite

tools/split-select/Android.mk

diff --git a/tools/split-select/Android.mk b/tools/split-select/Android.mk
index 863abae..199fafa 100644
--- a/tools/split-select/Android.mk
+++ b/tools/split-select/Android.mk
@@ -51,7 +51,7 @@
     liblog \
     libcutils \
     libexpat \
-    libziparchive-host \
+    libziparchive \
     libbase
 
 cFlags := -Wall -Werror