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

Commit 48e9dbfb authored by Evgeniy Stepanov's avatar Evgeniy Stepanov Committed by Android Git Automerger
Browse files

am 5788769d: Merge "Revert "Fix ODR issues in ART."" 

* commit '5788769d':
  Revert "Fix ODR issues in ART."
parents d708a28c 5788769d

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 := 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