commit 6e41d42f6b7977325a87a125c344c1c9cdf6c949
author Shih-wei Liao <sliao@google.com> Mon Mar 26 23:43:02 2012 -0700
committer Shih-wei Liao <sliao@google.com> Mon Mar 26 23:43:02 2012 -0700
tree c9263884328b6651db6a6908c1a866f0a32d2ee9
parent 02f01fedc5180d1d5a795674f8c5bd0a3ce974d2

DO NOT MERGE: Cope with current LLVM in this branch.

Change-Id: Id3dbfb96919bf1dd0e93d45ab18d0e4a06a08b72

build/Android.libart-compiler-llvm.mk

diff --git a/build/Android.libart-compiler-llvm.mk b/build/Android.libart-compiler-llvm.mk
index 134d87e..19152f6 100644
--- a/build/Android.libart-compiler-llvm.mk
+++ b/build/Android.libart-compiler-llvm.mk
@@ -84,11 +84,11 @@
     libLLVMARMCodeGen \
     libLLVMARMDesc
 
-#  libart_compiler_llvm_mips_STATIC_LIBRARIES := \
-#    libLLVMMipsInfo \
-#    libLLVMMipsCodeGen \
-#    libLLVMMipsDesc \
-#    libLLVMMipsAsmPrinter \
+  libart_compiler_llvm_mips_STATIC_LIBRARIES := \
+    libLLVMMipsInfo \
+    libLLVMMipsCodeGen \
+    libLLVMMipsDesc \
+    libLLVMMipsAsmPrinter \
 
   libart_compiler_llvm_x86_STATIC_LIBRARIES := \
     libLLVMX86Info \

build/Android.libart.mk

diff --git a/build/Android.libart.mk b/build/Android.libart.mk
index aa00a31..5bc8f46 100644
--- a/build/Android.libart.mk
+++ b/build/Android.libart.mk
@@ -88,11 +88,11 @@
       libLLVMARMCodeGen \
       libLLVMARMDesc
 
-#    libart_mips_STATIC_LIBRARIES := \
-#      libLLVMMipsInfo \
-#      libLLVMMipsCodeGen \
-#      libLLVMMipsDesc \
-#      libLLVMMipsAsmPrinter \
+    libart_mips_STATIC_LIBRARIES := \
+      libLLVMMipsInfo \
+      libLLVMMipsCodeGen \
+      libLLVMMipsDesc \
+      libLLVMMipsAsmPrinter \
 
     libart_x86_STATIC_LIBRARIES := \
       libLLVMX86Info \