p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 17c0e737: am ce915d95: Merge "Never use ASAN for acp." 

* commit '17c0e737047dcfa74cbd2386660b67bcde284f4c':
  Never use ASAN for acp.
This commit is contained in:
Dan Albert 2014-11-03 17:45:22 +00:00 committed by Android Git Automerger
parent 0a5105bd25 17c0e73704
commit 4043168802
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/host/Android.mk
View File

@ -1,5 +1,6 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES:= \
CopyFile.c
@ -20,6 +21,8 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
# acp to install libhost.
LOCAL_ACP_UNAVAILABLE:= true
LOCAL_ADDRESS_SANITIZER := false
include $(BUILD_HOST_STATIC_LIBRARY)
# Include toolchain prebuilt modules if they exist.

2
tools/acp/Android.mk
View File

@ -4,6 +4,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SRC_FILES := \
acp.c
@ -22,5 +23,6 @@ LOCAL_C_INCLUDES := build/libs/host/include
LOCAL_MODULE := acp
LOCAL_ACP_UNAVAILABLE := true
LOCAL_CXX_STL := none
LOCAL_ADDRESS_SANITIZER := false
include $(BUILD_HOST_EXECUTABLE)