commit 460a93a6d4d01bf0efa83acea0c84b4d43ab23c9
author Dan Albert <danalbert@google.com> Tue Oct 21 23:09:07 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 21 23:09:07 2014 +0000
tree e1fecee3cc396bace8351ad2343096239a026dd9
parent ab083da069a73f787a9304e155c0ab847c85377f
parent 5325f569213ec3b04a7eebf2b02cc7ba46ea6e84

Merge "Move vold to clang so ASAN_ALL works."

Android.mk

diff --git a/Android.mk b/Android.mk
index 1a8547c..fb43720 100644
--- a/Android.mk
+++ b/Android.mk
@@ -44,6 +44,7 @@
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_MODULE := libvold
+LOCAL_CLANG := true
 LOCAL_SRC_FILES := $(common_src_files)
 LOCAL_C_INCLUDES := $(common_c_includes)
 LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)
@@ -57,6 +58,7 @@
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_MODULE:= vold
+LOCAL_CLANG := true
 LOCAL_SRC_FILES := \
 	main.cpp \
 	$(common_src_files)
@@ -72,6 +74,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_CLANG := true
 LOCAL_SRC_FILES:= vdc.c
 LOCAL_MODULE:= vdc
 LOCAL_SHARED_LIBRARIES := libcutils