From a8cc2081b43402e81e607df459472fe3423ff8c4 Mon Sep 17 00:00:00 2001
From: Evgeniy Stepanov <eugenis@google.com>
Date: Sat, 30 May 2015 00:47:30 +0000
Subject: [PATCH] Revert "Fix ODR issues in ART."

Fails build on Mac.

This reverts commit 2148a1243ea9bfe2df491d39f63bd6d813dda252.

Change-Id: Ib4f0ba0b0a42500f20b7d73ca91363477fe3d093
---
 libziparchive/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk
index 559c48bb3..a3087eed7 100644
--- a/libziparchive/Android.mk
+++ b/libziparchive/Android.mk
@@ -42,8 +42,8 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 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