summaryrefslogtreecommitdiff
path: root/libziparchive
diff options
context:
space:
mode:
authorEvgenii Stepanov <eugenis@google.com>2015-05-26 17:31:13 -0700
committerEvgenii Stepanov <eugenis@google.com>2015-05-28 10:53:23 -0700
commit2148a1243ea9bfe2df491d39f63bd6d813dda252 (patch)
treeba974017458752097c3f3a918153d23623ff23a2 /libziparchive
parent7c7895755cf23140f08b7416ceff006dbbf7a411 (diff)
Fix ODR issues in ART.
Linking against both libziparchive-host and libz-host results in libz loaded twice (because it is also linked statically in libziparchive). bug: 21365909 Change-Id: Ie924e0b38e4c0811daff06e7c0bfed048e7ca82f
Diffstat (limited to 'libziparchive')
-rw-r--r--libziparchive/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk
index a3087eed7..559c48bb3 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 := 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