Add DISABLE_LLVM_DEVICE_BUILDS to libbcc.
Change-Id: Iaad7b2ea8eea6c89c1c1a3d0e145bbb7bf60c6b9
diff --git a/Android.mk b/Android.mk
index db75604..a59aa3b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,6 +46,7 @@
#=====================================================================
# Device Shared Library libbcc
#=====================================================================
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
ifeq ($(TARGET_ARCH),arm64)
$(info TODOArm64: $(LOCAL_PATH)/Android.mk Enable libbcc build)
endif
@@ -91,6 +92,7 @@
include $(LIBBCC_DEVICE_BUILD_MK)
include $(BUILD_SHARED_LIBRARY)
+endif
#=====================================================================
# Host Shared Library libbcc
diff --git a/bcinfo/Android.mk b/bcinfo/Android.mk
index b7296d9..07989a8 100644
--- a/bcinfo/Android.mk
+++ b/bcinfo/Android.mk
@@ -59,6 +59,7 @@
$(info TODOMips64: $(LOCAL_PATH)/Android.mk Enable build of libbcinfo device shared library)
endif
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
LOCAL_MODULE := libbcinfo
@@ -76,6 +77,7 @@
include $(LLVM_ROOT_PATH)/llvm-device-build.mk
include $(BUILD_SHARED_LIBRARY)
+endif
include $(CLEAR_VARS)
diff --git a/bcinfo/BitReader_2_7/Android.mk b/bcinfo/BitReader_2_7/Android.mk
index f60dbbd..6674617 100644
--- a/bcinfo/BitReader_2_7/Android.mk
+++ b/bcinfo/BitReader_2_7/Android.mk
@@ -24,6 +24,7 @@
# For the device
# =====================================================
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(bitcode_reader_2_7_SRC_FILES)
@@ -35,3 +36,4 @@
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
+endif
\ No newline at end of file
diff --git a/bcinfo/BitReader_3_0/Android.mk b/bcinfo/BitReader_3_0/Android.mk
index 13b6137..b18385e 100644
--- a/bcinfo/BitReader_3_0/Android.mk
+++ b/bcinfo/BitReader_3_0/Android.mk
@@ -22,6 +22,7 @@
# For the device
# =====================================================
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
LOCAL_MODULE:= libLLVMBitReader_3_0
@@ -32,3 +33,4 @@
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
+endif
\ No newline at end of file
diff --git a/bcinfo/Wrap/Android.mk b/bcinfo/Wrap/Android.mk
index adc306a..7da8b3f 100644
--- a/bcinfo/Wrap/Android.mk
+++ b/bcinfo/Wrap/Android.mk
@@ -45,6 +45,7 @@
# For the device
# =====================================================
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
LOCAL_MODULE:= libLLVMWrap
@@ -56,3 +57,4 @@
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
+endif
\ No newline at end of file
diff --git a/lib/Core/Android.mk b/lib/Core/Android.mk
index 12bb1b5..7d490cc 100644
--- a/lib/Core/Android.mk
+++ b/lib/Core/Android.mk
@@ -31,7 +31,7 @@
#=====================================================================
# Device Static Library: libbccCore
#=====================================================================
-
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
LOCAL_MODULE := libbccCore
@@ -44,7 +44,7 @@
include $(LIBBCC_GEN_CONFIG_MK)
include $(LLVM_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
+endif
#=====================================================================
# Host Static Library: libbccCore
diff --git a/lib/ExecutionEngine/Android.mk b/lib/ExecutionEngine/Android.mk
index 3f731e5..c9987c9 100644
--- a/lib/ExecutionEngine/Android.mk
+++ b/lib/ExecutionEngine/Android.mk
@@ -32,7 +32,7 @@
#=====================================================================
# Device Static Library: libbccExecutionEngine
#=====================================================================
-
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
LOCAL_MODULE := libbccExecutionEngine
@@ -54,7 +54,7 @@
include $(LIBBCC_GEN_CONFIG_MK)
include $(LLVM_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
+endif
#=====================================================================
# Host Static Library: libbccExecutionEngine
diff --git a/lib/Renderscript/Android.mk b/lib/Renderscript/Android.mk
index 1f77e0b..357571f 100644
--- a/lib/Renderscript/Android.mk
+++ b/lib/Renderscript/Android.mk
@@ -36,7 +36,7 @@
#=====================================================================
# Device Static Library: libbccRenderscript
#=====================================================================
-
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
# not supported on 64-bit yet
@@ -52,7 +52,7 @@
include $(LIBBCC_GEN_CONFIG_MK)
include $(LLVM_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
+endif
#=====================================================================
# Host Static Library: libbccRenderscript
diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk
index 9fed262..1baee7f 100644
--- a/lib/Support/Android.mk
+++ b/lib/Support/Android.mk
@@ -34,7 +34,7 @@
#=====================================================================
# Device Static Library: libbccSupport
#=====================================================================
-
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
# not supported on 64-bit yet
@@ -51,7 +51,7 @@
include $(LIBBCC_GEN_CONFIG_MK)
include $(LLVM_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
+endif
#=====================================================================
# Host Static Library: libbccSupport
diff --git a/libbcc.sha1.mk b/libbcc.sha1.mk
index 6759dd1..1eff581 100644
--- a/libbcc.sha1.mk
+++ b/libbcc.sha1.mk
@@ -1,7 +1,7 @@
#=====================================================================
# Calculate SHA1 checksum for libbcc.so, libRS.so and libclcore.bc
#=====================================================================
-
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
# not supported on 64-bit yet
@@ -48,3 +48,4 @@
LOCAL_MODULE_TARGET_ARCH := $(LLVM_SUPPORTED_ARCH)
include $(BUILD_SHARED_LIBRARY)
+endif
\ No newline at end of file
diff --git a/tools/bcc/Android.mk b/tools/bcc/Android.mk
index 8985377..e93660e 100644
--- a/tools/bcc/Android.mk
+++ b/tools/bcc/Android.mk
@@ -42,6 +42,7 @@
# Executable for target
# ========================================================
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
include $(CLEAR_VARS)
# not supported on 64-bit yet
@@ -59,3 +60,4 @@
include $(LIBBCC_GEN_CONFIG_MK)
include $(LLVM_DEVICE_BUILD_MK)
include $(BUILD_EXECUTABLE)
+endif
\ No newline at end of file
