Merge "Replace libziparchive-host with libziparchive"

am: 611e205bbe Change-Id: I077a18bc3e6de20e0d4d6d6213de829ea47ffe43
2016-08-26 20:25:13 +00:00
parent eefc000601 611e205bbe
commit 8c8bb25089
3 changed files with 3 additions and 3 deletions
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -61,7 +61,7 @@ aaptHostStaticLibs := \
    liblog \
    libcutils \
    libexpat \
-    libziparchive-host \
+    libziparchive \
    libbase

 aaptCFlags := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\"
--- a/tools/aapt2/Android.mk
+++ b/tools/aapt2/Android.mk
@@ -126,7 +126,7 @@ hostStaticLibs := \
 	liblog \
 	libcutils \
 	libexpat \
-	libziparchive-host \
+	libziparchive \
 	libpng \
 	libbase \
 	libprotobuf-cpp-lite
--- a/tools/split-select/Android.mk
+++ b/tools/split-select/Android.mk
@@ -51,7 +51,7 @@ hostStaticLibs := \
    liblog \
    libcutils \
    libexpat \
-    libziparchive-host \
+    libziparchive \
    libbase

 cFlags := -Wall -Werror