am 8c047830: Merge "Fix ODR issues in ART."

* commit '8c0478309e86c6c6d47124035a23f958fa7f08c4':
  Fix ODR issues in ART.
This commit is contained in:
Evgenii Stepanov 2015-06-30 22:34:41 +00:00 committed by Android Git Automerger
commit 7d4fc4495a

View file

@ -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