Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a884eef authored Jun 17, 2015 by Dan Albert Committed by Gerrit Code Review Jun 17, 2015

Merge "Stop disallowing sanitizers."

parents 40990c83 944fc40e

libs/host/Android.mk

+1 −2

Original line number	Diff line number	Diff line
		@@ -16,13 +16,12 @@ endif

		LOCAL_MODULE:= libhost
		LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
		LOCAL_CXX_STL := none

		# acp uses libhost, so we can't use
		# acp to install libhost.
		LOCAL_ACP_UNAVAILABLE:= true

		LOCAL_ADDRESS_SANITIZER := false

		include $(BUILD_HOST_STATIC_LIBRARY)

		# Include toolchain prebuilt modules if they exist.

tools/acp/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,5 @@ 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)