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-llvm.mk

diff --git a/build/Android.libart-compiler-llvm.mk b/build/Android.libart-compiler-llvm.mk
index 9ec356a..6e178d6 100644
--- a/build/Android.libart-compiler-llvm.mk
+++ b/build/Android.libart-compiler-llvm.mk
@@ -75,65 +75,9 @@
 
   LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
 
-  libart_compiler_llvm_arm_STATIC_LIBRARIES := \
-    libLLVMARMInfo \
-    libLLVMARMDisassembler \
-    libLLVMARMAsmParser \
-    libLLVMARMAsmPrinter \
-    libLLVMARMCodeGen \
-    libLLVMARMDesc
-
-  libart_compiler_llvm_mips_STATIC_LIBRARIES := \
-    libLLVMMipsInfo \
-    libLLVMMipsDisassembler \
-    libLLVMMipsCodeGen \
-    libLLVMMipsDesc \
-    libLLVMMipsAsmParser \
-    libLLVMMipsAsmPrinter
-
-  libart_compiler_llvm_x86_STATIC_LIBRARIES := \
-    libLLVMX86Info \
-    libLLVMX86AsmParser \
-    libLLVMX86CodeGen \
-    libLLVMX86Disassembler \
-    libLLVMX86Desc \
-    libLLVMX86AsmPrinter \
-    libLLVMX86Utils
-
-  ifeq ($$(art_target_or_host),target)
-    LOCAL_STATIC_LIBRARIES += \
-      $$(libart_compiler_llvm_$(TARGET_ARCH)_STATIC_LIBRARIES)
-  else
-    LOCAL_STATIC_LIBRARIES += \
-      $$(libart_compiler_llvm_arm_STATIC_LIBRARIES) \
-      $$(libart_compiler_llvm_mips_STATIC_LIBRARIES) \
-      $$(libart_compiler_llvm_x86_STATIC_LIBRARIES)
-  endif
-
-  LOCAL_STATIC_LIBRARIES += \
-    libLLVMObject \
-    libLLVMLinker \
-    libLLVMipo \
-    libLLVMBitWriter \
-    libLLVMBitReader \
-    libLLVMAsmPrinter \
-    libLLVMSelectionDAG \
-    libLLVMCodeGen \
-    libLLVMVectorize \
-    libLLVMScalarOpts \
-    libLLVMInstCombine \
-    libLLVMInstrumentation \
-    libLLVMTransformUtils \
-    libLLVMipa \
-    libLLVMAnalysis \
-    libLLVMTarget \
-    libLLVMMC \
-    libLLVMMCParser \
-    libLLVMCore \
-    libLLVMSupport
-
   LOCAL_SHARED_LIBRARIES := liblog libnativehelper
   LOCAL_SHARED_LIBRARIES += libcorkscrew # native stack trace support
+  LOCAL_SHARED_LIBRARIES += libbcc
   ifeq ($$(art_target_or_host),target)
     LOCAL_SHARED_LIBRARIES += libcutils libstlport libz libdl
     LOCAL_SHARED_LIBRARIES += libdynamic_annotations # tsan support