commit cdc6690a59ad63186b3c3e5f1f52e363c3381e39
author Shih-wei Liao <sliao@google.com> Sun Jul 22 16:45:37 2012 -0700
committer Shih-wei Liao <sliao@google.com> Mon Jul 23 18:08:19 2012 -0700
tree f165a0658ffca0ea3b5fd6deb877f364f4f1e3ed
parent 4407e61aa4cd75e6f31919cfca6a544d18b88c53

Switch to use libbcc and single copy of LLVM.

Don't check this in until libbcc's 6841435 and API refactoring CLs are checked in.

Change-Id: Ie49e1e9c2dc11bd92240d9153b60edf04296869c

build/Android.libart-compiler.mk

diff --git a/build/Android.libart-compiler.mk b/build/Android.libart-compiler.mk
index 3f3c23d..ba2fb33 100644
--- a/build/Android.libart-compiler.mk
+++ b/build/Android.libart-compiler.mk
@@ -116,6 +116,9 @@
     endif
     LOCAL_SHARED_LIBRARIES += libart
   endif
+  ifeq ($(ART_USE_QUICK_COMPILER), true)
+    LOCAL_SHARED_LIBRARIES += libbcc
+  endif
 
   # TODO: temporary hack for testing.
   ifeq ($$(libart_compiler_arch),mips)
@@ -128,14 +131,6 @@
 
   LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
 
-  ifeq ($(ART_USE_QUICK_COMPILER), true)
-    LOCAL_STATIC_LIBRARIES += \
-      libLLVMBitWriter \
-      libLLVMBitReader \
-      libLLVMCore \
-      libLLVMSupport
-  endif
-
   ifeq ($$(art_target_or_host),target)
     LOCAL_SHARED_LIBRARIES += libstlport
   else # host