commit 7e4940abbe2174391359675cb3b46883c67937cb
author Evgeniy Stepanov <eugenis@google.com> Sat May 30 01:51:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat May 30 01:51:40 2015 +0000
tree 67cb3ef8216c60e77338ab3cb0c5948b2f36595d
parent 77fbfbf700c9e23ca141f491e7c8b5291591991b
parent a8d441577677c928ce49394a7d341a483578deff

am 41ddac8d: am 48e9dbfb: am 5788769d: Merge "Revert "Fix ODR issues in ART.""

* commit '41ddac8dd304faa58363082c52d3630dc4d381b0':
  Revert "Fix ODR issues in ART."

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