Update LLVM lit test configuration to be able to work for 3.6.

Add support for building more host verification tools:
+ LLVMHello.so (loadable plugin pass)
+ lli-child-target
+ llvm-symbolizer (missing some Android.mk magic)
+ llvm-vtabledump
+ verify-uselistorder

Change-Id: Id7a9397bf458e97fc330ea0301ebb001750aac7c

3 files changed, 118 insertions, 0 deletions

diff --git a/tools/lli/ChildTarget/Android.mk b/tools/lli/ChildTarget/Android.mk
new file mode 100644
index 0000000..e4836e8
--- /dev/null
+++ b/tools/lli/ChildTarget/Android.mk
@@ -0,0 +1,31 @@
+LOCAL_PATH := $(call my-dir)
+
+LLVM_ROOT_PATH := $(LOCAL_PATH)/../../../
+
+
+#===---------------------------------------------------------------===
+# lli-child-target command line tool
+#===---------------------------------------------------------------===
+
+lli_child_target_SRC_FILES := \
+  ChildTarget.cpp \
+  ../RemoteTarget.cpp
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := lli-child-target
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_IS_HOST_MODULE := true
+
+LOCAL_SRC_FILES := $(lli_child_target_SRC_FILES)
+
+LOCAL_STATIC_LIBRARIES := \
+  libLLVMSupport
+
+LOCAL_LDLIBS += -lpthread -lm -ldl
+
+include $(LLVM_ROOT_PATH)/llvm.mk
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_HOST_EXECUTABLE)
diff --git a/tools/llvm-vtabledump/Android.mk b/tools/llvm-vtabledump/Android.mk
new file mode 100644
index 0000000..c3309e4
--- /dev/null
+++ b/tools/llvm-vtabledump/Android.mk
@@ -0,0 +1,60 @@
+LOCAL_PATH := $(call my-dir)
+
+LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM_ROOT_PATH)/llvm.mk
+
+llvm_vtabledump_SRC_FILES := \
+  Error.cpp \
+  llvm-vtabledump.cpp
+
+llvm_vtabledump_STATIC_LIBRARIES := \
+  libLLVMARMAsmParser \
+  libLLVMARMInfo \
+  libLLVMARMDesc \
+  libLLVMARMAsmPrinter \
+  libLLVMARMDisassembler \
+  libLLVMAArch64Info \
+  libLLVMAArch64AsmParser \
+  libLLVMAArch64Desc \
+  libLLVMAArch64AsmPrinter \
+  libLLVMAArch64Utils \
+  libLLVMAArch64Disassembler \
+  libLLVMMipsInfo \
+  libLLVMMipsAsmParser \
+  libLLVMMipsDesc \
+  libLLVMMipsAsmPrinter \
+  libLLVMMipsDisassembler \
+  libLLVMX86Info \
+  libLLVMX86Desc \
+  libLLVMX86AsmParser \
+  libLLVMX86CodeGen \
+  libLLVMX86AsmPrinter \
+  libLLVMX86Utils \
+  libLLVMX86Disassembler \
+  libLLVMAsmPrinter \
+  libLLVMCodeGen \
+  libLLVMAnalysis \
+  libLLVMTarget \
+  libLLVMObject \
+  libLLVMMCParser \
+  libLLVMMC \
+  libLLVMMCDisassembler \
+  libLLVMBitReader \
+  libLLVMCore \
+  libLLVMAsmParser \
+  libLLVMSupport \
+
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := llvm-vtabledump
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(llvm_vtabledump_SRC_FILES)
+LOCAL_LDLIBS += -lpthread -lm -ldl
+
+LOCAL_STATIC_LIBRARIES := $(llvm_vtabledump_STATIC_LIBRARIES)
+
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_HOST_EXECUTABLE)
diff --git a/tools/verify-uselistorder/Android.mk b/tools/verify-uselistorder/Android.mk
new file mode 100644
index 0000000..207f749
--- /dev/null
+++ b/tools/verify-uselistorder/Android.mk
@@ -0,0 +1,27 @@
+LOCAL_PATH := $(call my-dir)
+
+LLVM_ROOT_PATH := $(LOCAL_PATH)/../..
+include $(LLVM_ROOT_PATH)/llvm.mk
+
+verify_uselistorder_SRC_FILES := \
+  verify-uselistorder.cpp
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := verify-uselistorder
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(verify_uselistorder_SRC_FILES)
+LOCAL_LDLIBS += -lpthread -lm -ldl
+
+LOCAL_STATIC_LIBRARIES := \
+  libLLVMAsmParser \
+  libLLVMBitReader \
+  libLLVMBitWriter \
+  libLLVMCore \
+  libLLVMIRReader \
+  libLLVMSupport
+
+include $(LLVM_HOST_BUILD_MK)
+include $(LLVM_GEN_INTRINSICS_MK)
+include $(BUILD_HOST_EXECUTABLE)