commit 3566fe27f755b48da872610ac4036027db145f7b
author Tim Murray <timmurray@google.com> Sat Mar 15 00:58:08 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 15 00:58:08 2014 +0000
tree bbb2b6a18d33694a55a54b08a2a0e97685a28898
parent 40b8e5d8a4c13f37a59bd3d2a6dfd8e1cf7d1680
parent 4b4f557b295efe886cb7b4199f136afa9c6db6e8

Merge "Fix build break by not building compiler-rt without clang."

Android.mk

diff --git a/Android.mk b/Android.mk
index 2fe6909..f76764f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -280,6 +280,9 @@
       $(libcompiler_rt_x86_64_SRC_FILES),x86_64)
 endef
 
+# Don't build compiler-rt without clang
+ifneq ($(WITHOUT_TARGET_CLANG), true)
+
 #=====================================================================
 # Device Static Library: libcompiler_rt-extras
 #=====================================================================
@@ -334,3 +337,5 @@
 
 # Build ASan
 include $(LOCAL_PATH)/lib/asan/Android.mk
+
+endif
\ No newline at end of file