ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "Fix ODR issues in ART.""

Browse source
This commit is contained in:
Evgeniy Stepanov 2015-05-30 01:16:54 +00:00 • committed by Gerrit Code Review
commit 5788769ddc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libziparchive/Android.mk
View file

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