Merge "Revert "Fix ODR issues in ART."" (5788769d) · Commits · e / os / android_system_core

libziparchive/Android.mk

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -42,8 +42,8 @@ include $(BUILD_HOST_STATIC_LIBRARY)
	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_CPP_EXTENSION := .cc		LOCAL_CPP_EXTENSION := .cc
	LOCAL_SRC_FILES := ${source_files}		LOCAL_SRC_FILES := ${source_files}
	LOCAL_STATIC_LIBRARIES := libutils		LOCAL_STATIC_LIBRARIES := libz libutils
	LOCAL_SHARED_LIBRARIES := libz-host liblog libbase		LOCAL_SHARED_LIBRARIES := liblog libbase
	LOCAL_MODULE:= libziparchive-host		LOCAL_MODULE:= libziparchive-host
	LOCAL_CFLAGS := -Werror		LOCAL_CFLAGS := -Werror
	LOCAL_MULTILIB := both		LOCAL_MULTILIB := both