From d90e2404ddf6aeb57caffdac3d96506139d8e427 Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@google.com>
Date: Fri, 14 Jun 2013 10:52:50 -0700
Subject: [PATCH] Add support for WITHOUT_CLANG

(cherry picked from commit 051a1740eb434e317451c09b72ae09c81cbfa1c1)

Change-Id: I60b7d1fa958557d13b74563c07f694b86d6a6d6f
---
 core/binary.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/binary.mk b/core/binary.mk
index f40c4448d..71c49edf2 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -98,6 +98,10 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true)
   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)