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

4 files changed, 73 insertions, 1 deletions

diff --git a/Android.mk b/Android.mk
index bc628e1..c2a69f5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -84,6 +84,7 @@ subdirs += \
 # LLVM Command Line Tools
 subdirs += \
   tools/bugpoint \
+  tools/dsymutil \
   tools/llc \
   tools/lli \
   tools/lli/ChildTarget \
@@ -103,6 +104,7 @@ subdirs += \
   tools/llvm-mcmarkup \
   tools/llvm-nm \
   tools/llvm-objdump \
+  tools/llvm-pdbdump \
   tools/llvm-profdata \
   tools/llvm-readobj \
   tools/llvm-rtdyld \
diff --git a/test/lit.site.cfg b/test/lit.site.cfg
index 6967b23..3c15650 100644
--- a/test/lit.site.cfg
+++ b/test/lit.site.cfg
@@ -7,6 +7,7 @@ aosp_dir = os.getenv("ANDROID_BUILD_TOP")
 # Do not edit!
 config.enable_ffi = ""
 config.go_executable = ""
+config.gold_executable = "ld"
 config.have_ocamlopt = ""
 config.have_ocaml_ounit = ""
 config.host_triple = "x86_64-unknown-linux-gnu"
@@ -32,7 +33,8 @@ config.host_os = "Linux"
 config.host_arch = "x86_64"
 config.llvm_use_intel_jitevents = "OFF"
 config.llvm_use_sanitizer = ""
-config.have_zlib = "0"
+config.have_zlib = ""
+config.have_dia_sdk = 0
 
 # Support substitution of the tools_dir with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
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)