From e264bc80d21dd364c1c9b8f7db2c0c9fe6ce3701 Mon Sep 17 00:00:00 2001
From: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Date: Thu, 25 Aug 2016 20:46:26 +0200
Subject: add libLLVMExecutionEngine, libLLVMMCJIT and libLLVMRuntimeDyld as
 device modules

They are needed by llvmpipe

Change-Id: Ifdbc91a8f9a709b7cd9dd0f5ed3c956b308fe474
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
---
 lib/ExecutionEngine/Android.mk             | 25 +++++++++++++++++++++++++
 lib/ExecutionEngine/MCJIT/Android.mk       | 17 +++++++++++++++++
 lib/ExecutionEngine/RuntimeDyld/Android.mk | 22 ++++++++++++++++++++++
 3 files changed, 64 insertions(+)

diff --git a/lib/ExecutionEngine/Android.mk b/lib/ExecutionEngine/Android.mk
index 6578e2b..844a32b7 100644
--- a/lib/ExecutionEngine/Android.mk
+++ b/lib/ExecutionEngine/Android.mk
@@ -17,3 +17,28 @@ LOCAL_MODULE_TAGS := optional
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
+
+LOCAL_SRC_FILES := \
+	ExecutionEngineBindings.cpp \
+	ExecutionEngine.cpp \
+	GDBRegistrationListener.cpp \
+	SectionMemoryManager.cpp \
+	TargetSelect.cpp
+
+LOCAL_C_INCLUDES := $(LLVM_ROOT_PATH)/llvm/ExecutionEngine
+
+LOCAL_MODULE:= libLLVMExecutionEngine
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libLLVMRuntimeDyld libLLVMMCJIT
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_STATIC_LIBRARY)
+endif
diff --git a/lib/ExecutionEngine/MCJIT/Android.mk b/lib/ExecutionEngine/MCJIT/Android.mk
index 5827212..3f26814 100644
--- a/lib/ExecutionEngine/MCJIT/Android.mk
+++ b/lib/ExecutionEngine/MCJIT/Android.mk
@@ -13,3 +13,20 @@ LOCAL_MODULE_TAGS := optional
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
+
+LOCAL_SRC_FILES := \
+  MCJIT.cpp
+
+LOCAL_MODULE:= libLLVMMCJIT
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_STATIC_LIBRARY)
+endif
diff --git a/lib/ExecutionEngine/RuntimeDyld/Android.mk b/lib/ExecutionEngine/RuntimeDyld/Android.mk
index 40fdd7c..14f1cc6 100644
--- a/lib/ExecutionEngine/RuntimeDyld/Android.mk
+++ b/lib/ExecutionEngine/RuntimeDyld/Android.mk
@@ -18,3 +18,25 @@ LOCAL_MODULE_TAGS := optional
 
 include $(LLVM_HOST_BUILD_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
+
+LOCAL_SRC_FILES := \
+  RTDyldMemoryManager.cpp \
+  RuntimeDyldChecker.cpp \
+  RuntimeDyld.cpp \
+  RuntimeDyldCOFF.cpp \
+  RuntimeDyldELF.cpp \
+  RuntimeDyldMachO.cpp
+
+LOCAL_MODULE:= libLLVMRuntimeDyld
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_STATIC_LIBRARY)
+endif
-- 
cgit v1.1