commit dd50edcbe71397ca3be0d2d0b782618921cf859f
author Evgenii Stepanov <eugenis@google.com> Fri May 29 17:55:00 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 29 17:55:02 2015 +0000
tree fb161d0cf0622a2ac12bc5c232eac61934ee4c8f
parent a684d9dad58eaac4d4833321ae92e7327057f18b
parent 2148a1243ea9bfe2df491d39f63bd6d813dda252

Merge "Fix ODR issues in ART."

libziparchive/Android.mk

diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk
index a3087ee..559c48b 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 := libz libutils
-LOCAL_SHARED_LIBRARIES := liblog libbase
+LOCAL_STATIC_LIBRARIES := libutils
+LOCAL_SHARED_LIBRARIES := libz-host liblog libbase
 LOCAL_MODULE:= libziparchive-host
 LOCAL_CFLAGS := -Werror
 LOCAL_MULTILIB := both