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

am e514639f: am 2a884eef: Merge "Stop disallowing sanitizers." 

* commit 'e514639feba9ce77c36b8fee23e893fff8b4be0f':
  Stop disallowing sanitizers.
This commit is contained in:
Dan Albert 2015-06-17 17:45:37 +00:00 committed by Android Git Automerger
parent 4159f578ef e514639feb
commit 1a31eea230
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/host/Android.mk
View File

@ -16,13 +16,12 @@ endif
LOCAL_MODULE:= libhost LOCAL_MODULE:= libhost
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CXX_STL := none
# acp uses libhost, so we can't use # acp uses libhost, so we can't use
# acp to install libhost. # acp to install libhost.
LOCAL_ACP_UNAVAILABLE:= true LOCAL_ACP_UNAVAILABLE:= true
LOCAL_ADDRESS_SANITIZER := false
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
# Include toolchain prebuilt modules if they exist. # Include toolchain prebuilt modules if they exist.

1
tools/acp/Android.mk
View File

@ -23,6 +23,5 @@ LOCAL_C_INCLUDES := build/libs/host/include
LOCAL_MODULE := acp LOCAL_MODULE := acp
LOCAL_ACP_UNAVAILABLE := true LOCAL_ACP_UNAVAILABLE := true
LOCAL_CXX_STL := none LOCAL_CXX_STL := none
LOCAL_ADDRESS_SANITIZER := false
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)