commit a85afdb83d4d9d0fb03024eee9937b0882dd81ad
author Ying Wang <wangying@android.com> Mon Sep 16 20:38:28 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 16 20:38:29 2013 +0000
tree 5e2e7be211bb7707d9046f475c1ed65571c6d74b
parent 7f2ad751aebf9d13d63f20a451c28d4a41c4569a
parent d90e2404ddf6aeb57caffdac3d96506139d8e427

Merge "Add support for WITHOUT_CLANG"

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index f40c444..71c49ed 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -98,6 +98,10 @@
   LOCAL_STATIC_LIBRARIES += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)
 endif
 
+ifeq ($(strip $(WITHOUT_CLANG)),true)
+  LOCAL_CLANG :=
+endif
+
 # Add in libcompiler_rt for all regular device builds
 ifeq (,$(LOCAL_SDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(WITHOUT_LIBCOMPILER_RT))
   LOCAL_STATIC_LIBRARIES += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)