commit a05cb41300b652e6125c6df42d4aa756101e6e72
author Dan Albert <danalbert@google.com> Thu Nov 06 00:15:12 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 06 00:15:12 2014 +0000
tree 0193b54621cfc32d2b3d8a07ae4dc74095f49766
parent 096dd2dd8c0294253c4b88b2c02715bf56e0287c
parent 460a93a6d4d01bf0efa83acea0c84b4d43ab23c9

am 460a93a6: Merge "Move vold to clang so ASAN_ALL works."

* commit '460a93a6d4d01bf0efa83acea0c84b4d43ab23c9':
  Move vold to clang so ASAN_ALL works.

Android.mk

diff --git a/Android.mk b/Android.mk
index 8647c97..f0747b9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -55,6 +55,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)
@@ -68,6 +69,7 @@
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_MODULE:= vold
+LOCAL_CLANG := true
 LOCAL_SRC_FILES := \
 	main.cpp \
 	$(common_src_files)
@@ -83,6 +85,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