Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 953314fc authored by Evgenii Stepanov's avatar Evgenii Stepanov
Browse files

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).

Change-Id: Ib34eef60200a702c2d7fbca3589b324992e78eab
parent b80ed906

libziparchive/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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