aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk1
-rw-r--r--tools/llvm-link/Android.mk (renamed from tools/llvm-link/Android.mk.disabled)15
2 files changed, 15 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index dc37ac9..b972a0a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -9,6 +9,7 @@ subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
lib/Support \
utils/TableGen \
tools/llvm-as \
+ tools/llvm-link \
lib/VMCore \
lib/Bitcode/Reader \
lib/Bitcode/Writer \
diff --git a/tools/llvm-link/Android.mk.disabled b/tools/llvm-link/Android.mk
index 4cabcfb..94b439e 100644
--- a/tools/llvm-link/Android.mk.disabled
+++ b/tools/llvm-link/Android.mk
@@ -2,13 +2,26 @@
ifeq ($(TARGET_ARCH),arm)
LOCAL_PATH:= $(call my-dir)
+
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
llvm-link.cpp
-LOCAL_STATIC_LIBRARIES := libLLVMLinker libLLVMBitReader libLLVMBitWriter libLLVMCore libLLVMSupport libLLVMSystem libLLVMAsmParser
+LOCAL_STATIC_LIBRARIES := \
+ libLLVMLinker \
+ libLLVMBitReader \
+ libLLVMBitWriter \
+ libLLVMCore \
+ libLLVMSupport \
+ libLLVMSystem \
+ libLLVMAsmParser \
+ libLLVMTransformUtils
+
LOCAL_MODULE := llvm-link
+
+LOCAL_MODULE_TAGS := optional
+
LOCAL_LDLIBS += -lpthread -lm -ldl
include $(LLVM_HOST_BUILD_MK)