From 9cc1fddf0cebbde07241416c8d01cfb198e40218 Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Fri, 25 Jul 2014 01:23:30 -0700
Subject: Fix build of llvm-ar.

Bug: 15433215

llvm-ar was accidentally including static libraries and libLLVM dynamically,
leading to redefined options.

Change-Id: If1f05ff68a3c88580b9ff1981937e8d2cf99ee02
---
 tools/llvm-ar/Android.mk | 54 ------------------------------------------------
 1 file changed, 54 deletions(-)

(limited to 'tools')

diff --git a/tools/llvm-ar/Android.mk b/tools/llvm-ar/Android.mk
index 23cd857..cc0979e 100644
--- a/tools/llvm-ar/Android.mk
+++ b/tools/llvm-ar/Android.mk
@@ -10,59 +10,6 @@ LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
 llvm_ar_SRC_FILES := \
   llvm-ar.cpp
 
-llvm_ar_STATIC_LIBRARIES := \
-  libLLVMObject             \
-  libLLVMBitReader          \
-  libLLVMCore               \
-  libLLVMSupport            \
-
-#  libLLVMAArch64CodeGen \
-  libLLVMAArch64Info \
-  libLLVMAArch64Desc \
-  libLLVMAArch64AsmParser \
-  libLLVMAArch64AsmPrinter \
-  libLLVMAArch64Disassembler \
-  libLLVMARMCodeGen \
-  libLLVMARMInfo \
-  libLLVMARMDesc \
-  libLLVMARMAsmParser \
-  libLLVMARMAsmPrinter \
-  libLLVMARMDisassembler \
-  libLLVMMipsCodeGen \
-  libLLVMMipsInfo \
-  libLLVMMipsDesc \
-  libLLVMMipsAsmParser \
-  libLLVMMipsAsmPrinter \
-  libLLVMMipsDisassembler \
-  libLLVMX86CodeGen \
-  libLLVMX86Info \
-  libLLVMX86Desc \
-  libLLVMX86AsmParser \
-  libLLVMX86AsmPrinter \
-  libLLVMX86Disassembler \
-  libLLVMAsmPrinter \
-  libLLVMSelectionDAG \
-  libLLVMCodeGen \
-  libLLVMObject \
-  libLLVMScalarOpts \
-  libLLVMInstCombine \
-  libLLVMInstrumentation \
-  libLLVMTransformObjCARC \
-  libLLVMTransformUtils \
-  libLLVMipa \
-  libLLVMAnalysis \
-  libLLVMTarget \
-  libLLVMMC \
-  libLLVMMCParser \
-  libLLVMCore \
-  libLLVMAsmParser \
-  libLLVMOption \
-  libLLVMSupport \
-  libLLVMVectorize \
-
-
-
-
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := llvm-ar
@@ -72,7 +19,6 @@ LOCAL_IS_HOST_MODULE := true
 
 LOCAL_SRC_FILES := $(llvm_ar_SRC_FILES)
 
-LOCAL_STATIC_LIBRARIES := $(llvm_ar_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES := libLLVM
 
 LOCAL_LDLIBS += -lpthread -lm -ldl
-- 
cgit v1.1