commit 8b977d38483aaa08abcbdaa5fa888076c1142169
author Logan Chien <loganchien@google.com> Tue Feb 21 19:14:55 2012 +0800
committer Shih-wei Liao <sliao@google.com> Wed Feb 29 17:11:27 2012 -0800
tree ae61c7cb1c397582f22c5c585bb0b531fd8f59b0
parent 88894ee835411de72025cd8a5d8d111a6f2a004a

Compile llvm.Module into ELF object file.

Change-Id: I8faf7427944324c9bac12573d217cde2a2e658f1

build/Android.libart.mk

diff --git a/build/Android.libart.mk b/build/Android.libart.mk
index d7ebefe..b049ad9 100644
--- a/build/Android.libart.mk
+++ b/build/Android.libart.mk
@@ -71,7 +71,58 @@
   endif
   LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
   ifeq ($(ART_USE_LLVM_COMPILER),true)
-    LOCAL_STATIC_LIBRARIES += libLLVMBitWriter libLLVMCore libLLVMSupport
+    libart_arm_STATIC_LIBRARIES := \
+      libLLVMARMInfo \
+      libLLVMARMDisassembler \
+      libLLVMARMAsmParser \
+      libLLVMARMAsmPrinter \
+      libLLVMARMCodeGen \
+      libLLVMARMDesc
+
+    libart_mips_STATIC_LIBRARIES := \
+      libLLVMMipsInfo \
+      libLLVMMipsCodeGen \
+      libLLVMMipsDesc \
+      libLLVMMipsAsmPrinter \
+
+    libart_x86_STATIC_LIBRARIES := \
+      libLLVMX86Info \
+      libLLVMX86AsmParser \
+      libLLVMX86CodeGen \
+      libLLVMX86Disassembler \
+      libLLVMX86Desc \
+      libLLVMX86AsmPrinter \
+      libLLVMX86Utils
+
+    ifeq ($$(art_target_or_host),target)
+      LOCAL_STATIC_LIBRARIES += \
+        $$(libart_arm_STATIC_LIBRARIES)
+    else
+      LOCAL_STATIC_LIBRARIES += \
+        $$(libart_arm_STATIC_LIBRARIES) \
+        $$(libart_mips_STATIC_LIBRARIES) \
+        $$(libart_x86_STATIC_LIBRARIES)
+    endif
+
+    LOCAL_STATIC_LIBRARIES += \
+      libLLVMLinker \
+      libLLVMipo \
+      libLLVMBitWriter \
+      libLLVMBitReader \
+      libLLVMAsmPrinter \
+      libLLVMSelectionDAG \
+      libLLVMCodeGen \
+      libLLVMScalarOpts \
+      libLLVMInstCombine \
+      libLLVMInstrumentation \
+      libLLVMTransformUtils \
+      libLLVMipa \
+      libLLVMAnalysis \
+      libLLVMTarget \
+      libLLVMMC \
+      libLLVMMCParser \
+      libLLVMCore \
+      libLLVMSupport
   endif
   LOCAL_SHARED_LIBRARIES := liblog libnativehelper
   ifeq ($$(art_target_or_host),target)