commit bcf74f96afbd2ba0df4b9e42258298ff58d16487
author Evgeniy Stepanov <eugenis@google.com> Sat May 30 00:47:30 2015 +0000
committer Evgeniy Stepanov <eugenis@google.com> Sat May 30 00:47:30 2015 +0000
tree 6029a88a7540e75b4b4cc260cd986d2908e1d1ab
parent ff1029383181beadb544803352aaad01d961e2c8

Revert "Fix ODR issues in ART."

Fails build on Mac.

This reverts commit 2148a1243ea9bfe2df491d39f63bd6d813dda252.

Change-Id: Ib4f0ba0b0a42500f20b7d73ca91363477fe3d093

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