commit d90e2404ddf6aeb57caffdac3d96506139d8e427
author Mike Lockwood <lockwood@google.com> Fri Jun 14 10:52:50 2013 -0700
committer Brian Carlstrom <bdc@google.com> Mon Sep 16 10:20:08 2013 -0700
tree 5e2e7be211bb7707d9046f475c1ed65571c6d74b
parent 7f2ad751aebf9d13d63f20a451c28d4a41c4569a

Add support for WITHOUT_CLANG

(cherry picked from commit 051a1740eb434e317451c09b72ae09c81cbfa1c1)

Change-Id: I60b7d1fa958557d13b74563c07f694b86d6a6d6f

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)