Merge "Replace libziparchive-host with libziparchive" am: 611e205bbe

am: 8c8bb25089 Change-Id: Iaa10133cfcf424d82f170bf5b8b21487a982e5fb
2016-08-26 20:32:24 +00:00
parent 4019963b96 8c8bb25089
commit 63dc310e6a
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