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 5788769d: Merge "Revert "Fix ODR issues in ART."" 

* commit '5788769ddcb9ab33a36fdf4d078f90a4ef022d8d':
  Revert "Fix ODR issues in ART."
This commit is contained in:
Evgeniy Stepanov 2015-05-30 01:28:36 +00:00 committed by Android Git Automerger
parent d708a28cf8 5788769ddc
commit 48e9dbfb9a
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 := 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