openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

* commit 'dd50edcbe71397ca3be0d2d0b782618921cf859f':
  Fix ODR issues in ART.
This commit is contained in:
Evgenii Stepanov 2015-05-29 18:08:46 +00:00 committed by Android Git Automerger
parent 46021d0a18 dd50edcbe7
commit d708a28cf8
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)
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