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

Commit d708a28c authored by Evgenii Stepanov's avatar Evgenii Stepanov Committed by Android Git Automerger
Browse files

am dd50edcb: Merge "Fix ODR issues in ART." 

* commit 'dd50edcb':
  Fix ODR issues in ART.
parents 46021d0a dd50edcb

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