commit ac3f76b3e1758f8c09a0ad829087f007635bf177
author Shih-wei Liao <sliao@google.com> Wed Mar 14 18:25:40 2012 -0700
committer Shih-wei Liao <sliao@google.com> Wed Mar 14 18:35:13 2012 -0700
tree f3ab538bc02fdd76d3f68edcbc72f27ac77b256a
parent 36fcb62533d9e226ede2086a7f400bc79b10c8cf

DO NOT MERGE. Revert "am 002b9152: Don\'t try to link in libraries we\'re not building yet."

This reverts commit 2578cebf3026f6f5e3b1701e1435c5c6443bd9eb, reversing
changes made to fe131b26883682e434c3860d909c3d1135343425.

Change-Id: I106b4b8509da98053bf2012153f54efae8e2d970

build/Android.libart-compiler-llvm.mk

diff --git a/build/Android.libart-compiler-llvm.mk b/build/Android.libart-compiler-llvm.mk
index 1b584d6..bb7b458 100644
--- a/build/Android.libart-compiler-llvm.mk
+++ b/build/Android.libart-compiler-llvm.mk
@@ -83,11 +83,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 \