commit 31f45b2e6d4920308d2820e043455c241050ca33
author Elliott Hughes <enh@google.com> Sat May 30 01:29:19 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat May 30 01:29:20 2015 +0000
tree 2446f68f18166712b2293b7bf3e8e42ac2081d92
parent 6857a4242fac3f4fc98201e35b7d05e3bb031578
parent 549c25862fdaa2a90ca913b55927dea26366a31c

Merge "Fix error handling/reporting for "adb forward" and "adb reverse"."

libziparchive/Android.mk

diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk
index 559c48b..a3087ee 100644
--- a/libziparchive/Android.mk
+++ b/libziparchive/Android.mk
@@ -42,8 +42,8 @@
 include $(CLEAR_VARS)
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := ${source_files}
-LOCAL_STATIC_LIBRARIES := libutils
-LOCAL_SHARED_LIBRARIES := libz-host liblog libbase
+LOCAL_STATIC_LIBRARIES := libz libutils
+LOCAL_SHARED_LIBRARIES := liblog libbase
 LOCAL_MODULE:= libziparchive-host
 LOCAL_CFLAGS := -Werror
 LOCAL_MULTILIB := both