Disable clang compilation for mips and arm64 targets.
Temporary workaround before we fix all mips and arm64
clang/llvm compilation errors.
BUG: 21119263
Change-Id: Id50d1d472cef9640b1689fa53bad1cc2f0d99c42
(cherry picked from commit aaf0730e43f282635912674b6325c8c5bc60cef6)
diff --git a/Android.mk b/Android.mk
index 7c6fa2f..10c4e63 100644
--- a/Android.mk
+++ b/Android.mk
@@ -81,7 +81,8 @@
# Temporarily disable clang build for this project:
# mips and arm64 do not compile with clang
-LOCAL_CLANG := false
+LOCAL_CLANG_arm64 := false
+LOCAL_CLANG_mips := false
LOCAL_MODULE := libjemalloc
LOCAL_MODULE_TAGS := optional
@@ -105,6 +106,9 @@
#-----------------------------------------------------------------------
include $(CLEAR_VARS)
+LOCAL_CLANG_arm64 := false
+LOCAL_CLANG_mips := false
+
LOCAL_MODULE := libjemalloc_jet
LOCAL_MODULE_TAGS := optional
@@ -139,6 +143,9 @@
#-----------------------------------------------------------------------
include $(CLEAR_VARS)
+LOCAL_CLANG_arm64 := false
+LOCAL_CLANG_mips := false
+
LOCAL_MODULE := libjemalloc_unittest
LOCAL_MODULE_TAGS := optional
@@ -206,6 +213,9 @@
#-----------------------------------------------------------------------
include $(CLEAR_VARS)
+LOCAL_CLANG_arm64 := false
+LOCAL_CLANG_mips := false
+
LOCAL_MODULE := libjemalloc_integrationtest
LOCAL_MODULE_TAGS := optional
diff --git a/Android.test.mk b/Android.test.mk
index 0278677..744bd7b 100644
--- a/Android.test.mk
+++ b/Android.test.mk
@@ -16,6 +16,9 @@
include $(CLEAR_VARS)
+LOCAL_CLANG_arm64 := false
+LOCAL_CLANG_mips := false
+
LOCAL_MODULE := $(test_name)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(test_path)
