libLLVM.so build rules for the device.

Change-Id: I39ff136b64a861e67899a1b9639d6bca080e1736

3 files changed, 108 insertions, 58 deletions

diff --git a/Android.mk b/Android.mk
index e5866ad..dd40db7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -70,5 +70,5 @@ subdirs += tools/llvm-link
 
 
 include $(LOCAL_PATH)/llvm.mk
-include $(LOCAL_PATH)/host_shared_llvm.mk
+include $(LOCAL_PATH)/shared_llvm.mk
 include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, $(subdirs)))
diff --git a/host_shared_llvm.mk b/host_shared_llvm.mk
deleted file mode 100644
index 8465d71..0000000
--- a/host_shared_llvm.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-LOCAL_IS_HOST_MODULE := true
-
-LOCAL_MODULE:= libLLVM
-
-LOCAL_MODULE_TAGS := optional
-
-# Host build pulls in all ARM, Mips, X86 components.
-LOCAL_WHOLE_STATIC_LIBRARIES := \
-	libLLVMLinker \
-	libLLVMipo \
-	libLLVMBitWriter \
-	libLLVMBitReader \
-	libLLVMARMCodeGen \
-	libLLVMARMAsmParser \
-	libLLVMARMAsmPrinter \
-	libLLVMARMInfo \
-	libLLVMARMDesc \
-	libLLVMX86CodeGen \
-	libLLVMX86Info \
-	libLLVMX86Desc \
-	libLLVMX86AsmParser \
-	libLLVMX86AsmPrinter \
-	libLLVMX86Utils \
-	libLLVMMipsCodeGen \
-	libLLVMMipsInfo \
-	libLLVMMipsDesc \
-	libLLVMMipsAsmParser \
-	libLLVMMipsAsmPrinter \
-	libLLVMAsmPrinter \
-	libLLVMSelectionDAG \
-	libLLVMCodeGen \
-	libLLVMScalarOpts \
-	libLLVMInstCombine \
-	libLLVMInstrumentation \
-	libLLVMTransformUtils \
-	libLLVMipa \
-	libLLVMAnalysis \
-	libLLVMTarget \
-	libLLVMMC \
-	libLLVMMCParser \
-	libLLVMCore \
-	libLLVMArchive \
-	libLLVMAsmParser \
-	libLLVMSupport \
-	libLLVMVectorize
-
-ifeq ($(HOST_OS),windows)
-  LOCAL_LDLIBS := -limagehlp -lpsapi
-else
-  LOCAL_LDLIBS := -ldl -lpthread
-endif
-
-include $(LLVM_HOST_BUILD_MK)
-#include $(LLVM_GEN_INTRINSICS_MK)
-include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/shared_llvm.mk b/shared_llvm.mk
new file mode 100644
index 0000000..6f85040
--- /dev/null
+++ b/shared_llvm.mk
@@ -0,0 +1,107 @@
+LOCAL_PATH:= $(call my-dir)
+
+llvm_pre_static_libraries := \
+  libLLVMLinker \
+  libLLVMipo \
+  libLLVMBitWriter \
+  libLLVMBitReader
+
+llvm_arm_static_libraries := \
+  libLLVMARMCodeGen \
+  libLLVMARMAsmParser \
+  libLLVMARMAsmPrinter \
+  libLLVMARMInfo \
+  libLLVMARMDesc
+
+llvm_x86_static_libraries := \
+  libLLVMX86CodeGen \
+  libLLVMX86Info \
+  libLLVMX86Desc \
+  libLLVMX86AsmParser \
+  libLLVMX86AsmPrinter \
+  libLLVMX86Utils
+
+llvm_mips_static_libraries := \
+  libLLVMMipsCodeGen \
+  libLLVMMipsInfo \
+  libLLVMMipsDesc \
+  libLLVMMipsAsmParser \
+  libLLVMMipsAsmPrinter
+
+llvm_post_static_libraries := \
+  libLLVMAsmPrinter \
+  libLLVMSelectionDAG \
+  libLLVMCodeGen \
+  libLLVMScalarOpts \
+  libLLVMInstCombine \
+  libLLVMInstrumentation \
+  libLLVMTransformUtils \
+  libLLVMipa \
+  libLLVMAnalysis \
+  libLLVMTarget \
+  libLLVMMC \
+  libLLVMMCParser \
+  libLLVMCore \
+  libLLVMArchive \
+  libLLVMAsmParser \
+  libLLVMSupport \
+  libLLVMVectorize
+
+# HOST LLVM shared library build
+include $(CLEAR_VARS)
+LOCAL_IS_HOST_MODULE := true
+
+LOCAL_MODULE:= libLLVM
+
+LOCAL_MODULE_TAGS := optional
+
+# Host build pulls in all ARM, Mips, X86 components.
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+  $(llvm_pre_static_libraries) \
+  $(llvm_arm_static_libraries) \
+  $(llvm_x86_static_libraries) \
+  $(llvm_mips_static_libraries) \
+  $(llvm_post_static_libraries)
+
+ifeq ($(HOST_OS),windows)
+  LOCAL_LDLIBS := -limagehlp -lpsapi
+else
+  LOCAL_LDLIBS := -ldl -lpthread
+endif
+
+include $(LLVM_HOST_BUILD_MK)
+include $(BUILD_HOST_SHARED_LIBRARY)
+
+
+# DEVICE LLVM shared library build
+include $(CLEAR_VARS)
+
+LOCAL_MODULE:= libLLVM
+
+LOCAL_MODULE_TAGS := optional
+
+# Device build selectively pulls in ARM, Mips, X86 components.
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+  $(llvm_pre_static_libraries)
+
+ifeq ($(TARGET_ARCH),arm)
+  LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_arm_static_libraries)
+else
+  ifeq ($(TARGET_ARCH),x86)
+    LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_x86_static_libraries)
+  else
+    ifeq ($(TARGET_ARCH),mips)
+      LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_mips_static_libraries)
+    else
+      $(error Unsupported architecture $(TARGET_ARCH))
+    endif
+  endif
+endif
+
+LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries)
+
+#LOCAL_LDLIBS := -ldl -lpthread
+LOCAL_SHARED_LIBRARIES := libcutils libdl libstlport
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(BUILD_SHARED_LIBRARY)