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

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

Browse source 
* commit 'ae18127ec33b030aeaa4eece6b741784b016e48c':
  Fix ODR issues in ART.
This commit is contained in:
Evgenii Stepanov 2015-06-30 22:59:03 +00:00 • committed by Android Git Automerger
commit c034a164c9
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