From ceee4f98348e1a34c13efee0cec892ce5d2fa98b Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Wed, 1 Apr 2015 19:21:59 -0700 Subject: Update lit.site.cfg to be able to run LLVM tests properly again. Bug: 15433215 Add support for building llvm-dsymutil. Add support for building llvm-pdbdump. We still have 4 unexpected failures to track down with the Android build/run of these tests. These are all related to module loading support. Change-Id: Ibd39cbd2c0ee232a0df23a414d491420493ea94a --- tools/dsymutil/Android.mk | 34 ++++++++++++++++++++++++++++++++++ tools/llvm-pdbdump/Android.mk | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 tools/dsymutil/Android.mk create mode 100644 tools/llvm-pdbdump/Android.mk (limited to 'tools') diff --git a/tools/dsymutil/Android.mk b/tools/dsymutil/Android.mk new file mode 100644 index 0000000..873146e --- /dev/null +++ b/tools/dsymutil/Android.mk @@ -0,0 +1,34 @@ +LOCAL_PATH := $(call my-dir) + +LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. +include $(LLVM_ROOT_PATH)/llvm.mk + +llvm_dsymutil_SRC_FILES := \ + BinaryHolder.cpp \ + DebugMap.cpp \ + dsymutil.cpp \ + DwarfLinker.cpp \ + MachODebugMapParser.cpp + +llvm_dsymutil_STATIC_LIBRARIES := \ + libLLVMDebugInfoDWARF \ + libLLVMObject \ + libLLVMMCParser \ + libLLVMMC \ + libLLVMBitReader \ + libLLVMCore \ + libLLVMSupport + +include $(CLEAR_VARS) + +LOCAL_MODULE := llvm-dsymutil +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_MODULE_TAGS := optional +LOCAL_SRC_FILES := $(llvm_dsymutil_SRC_FILES) +LOCAL_LDLIBS += -lpthread -lm -ldl + +LOCAL_STATIC_LIBRARIES := $(llvm_dsymutil_STATIC_LIBRARIES) + +include $(LLVM_HOST_BUILD_MK) +include $(LLVM_GEN_INTRINSICS_MK) +include $(BUILD_HOST_EXECUTABLE) diff --git a/tools/llvm-pdbdump/Android.mk b/tools/llvm-pdbdump/Android.mk new file mode 100644 index 0000000..82a406a --- /dev/null +++ b/tools/llvm-pdbdump/Android.mk @@ -0,0 +1,34 @@ +LOCAL_PATH := $(call my-dir) + +LLVM_ROOT_PATH := $(LOCAL_PATH)/../.. +include $(LLVM_ROOT_PATH)/llvm.mk + +llvm_pdbdump_SRC_FILES := \ + ClassDefinitionDumper.cpp \ + CompilandDumper.cpp \ + FunctionDumper.cpp \ + llvm-pdbdump.cpp \ + TypedefDumper.cpp \ + TypeDumper.cpp \ + VariableDumper.cpp + +llvm_pdbdump_STATIC_LIBRARIES := \ + libLLVMDebugInfoPDB \ + libLLVMSupport + +include $(CLEAR_VARS) + +LOCAL_MODULE := llvm-pdbdump +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_IS_HOST_MODULE := true + +LOCAL_SRC_FILES := $(llvm_pdbdump_SRC_FILES) + +LOCAL_STATIC_LIBRARIES := $(llvm_pdbdump_STATIC_LIBRARIES) + +LOCAL_LDLIBS += -lpthread -lm -ldl + +include $(LLVM_HOST_BUILD_MK) +include $(LLVM_GEN_INTRINSICS_MK) +include $(BUILD_HOST_EXECUTABLE) -- cgit v1.1