commit c6e6ee4392390c0888f808220adf33334e1f64a4
author Tim Murray <timmurray@google.com> Mon Apr 07 14:13:26 2014 -0700
committer Tim Murray <timmurray@google.com> Mon Apr 07 16:29:40 2014 -0700
tree 9bf7a6b5001550ce277dada3d068652935fd260c
parent 4c7d59a1edb76d8d4292bf8a04f03c0eeea8012d

Add DISABLE_LLVM_DEVICE_BUILDS to libbcc.

Change-Id: Iaad7b2ea8eea6c89c1c1a3d0e145bbb7bf60c6b9

lib/Core/Android.mk

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

lib/ExecutionEngine/Android.mk

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

lib/Renderscript/Android.mk

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

lib/Support/Android.mk

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