Merge "Fix corner cases in lit xunit for paths with dots"

[android-x86/external-llvm.git] / shared_llvm.mk

diff --git a/shared_llvm.mk b/shared_llvm.mk
index 3f9e104..e9bedb5 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -1,11 +1,9 @@
-# Don't build the library in unbundled branches.
-ifeq (,$(TARGET_BUILD_APPS))
-
 LOCAL_PATH:= $(call my-dir)
 
 llvm_pre_static_libraries := \
   libLLVMLinker \
   libLLVMipo \
+  libLLVMDebugInfo \
   libLLVMIRReader \
   libLLVMBitWriter \
   libLLVMBitReader
@@ -35,6 +33,15 @@ llvm_mips_static_libraries := \
   libLLVMMipsAsmPrinter \
   libLLVMMipsDisassembler
 
+llvm_aarch64_static_libraries := \
+  libLLVMAArch64CodeGen \
+  libLLVMAArch64Info \
+  libLLVMAArch64Desc \
+  libLLVMAArch64AsmParser \
+  libLLVMAArch64AsmPrinter \
+  libLLVMAArch64Utils \
+  libLLVMAArch64Disassembler
+
 llvm_post_static_libraries := \
   libLLVMAsmPrinter \
   libLLVMSelectionDAG \
@@ -48,19 +55,19 @@ llvm_post_static_libraries := \
   libLLVMipa \
   libLLVMAnalysis \
   libLLVMTarget \
+  libLLVMMCDisassembler \
   libLLVMMC \
   libLLVMMCParser \
   libLLVMCore \
   libLLVMAsmParser \
   libLLVMOption \
   libLLVMSupport \
-  libLLVMVectorize
+  libLLVMVectorize \
+  libLLVMProfileData
 
 llvm_host_static_libraries := \
   libLLVMExecutionEngine \
-  libLLVMMCDisassembler \
   libLLVMRuntimeDyld \
-  libLLVMJIT \
   libLLVMMCJIT
 
 ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
@@ -78,6 +85,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
   $(llvm_arm_static_libraries) \
   $(llvm_x86_static_libraries) \
   $(llvm_mips_static_libraries) \
+  $(llvm_aarch64_static_libraries) \
   $(llvm_host_static_libraries) \
   $(llvm_post_static_libraries)
 
@@ -95,6 +103,7 @@ ifeq (,$(filter $(TARGET_ARCH),$(LLVM_SUPPORTED_ARCH)))
 $(warning TODO $(TARGET_ARCH): Enable llvm build)
 endif
 
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
 # DEVICE LLVM shared library build
 include $(CLEAR_VARS)
 
@@ -110,13 +119,21 @@ LOCAL_WHOLE_STATIC_LIBRARIES_arm += $(llvm_arm_static_libraries)
 LOCAL_WHOLE_STATIC_LIBRARIES_x86 += $(llvm_x86_static_libraries)
 LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_x86_static_libraries)
 LOCAL_WHOLE_STATIC_LIBRARIES_mips += $(llvm_mips_static_libraries)
+LOCAL_WHOLE_STATIC_LIBRARIES_mips64 += $(llvm_mips_static_libraries)
+LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_aarch64_static_libraries)
+LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_arm_static_libraries)
+
+ifeq ($(BUILD_ARM_FOR_X86),true)
+LOCAL_WHOLE_STATIC_LIBRARIES_x86 += $(llvm_arm_static_libraries)
+LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_arm_static_libraries)
+endif
 
 LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries)
 
 #LOCAL_LDLIBS := -ldl -lpthread
-LOCAL_SHARED_LIBRARIES := libcutils libdl libstlport
+LOCAL_SHARED_LIBRARIES := libcutils libdl libc++
 
 include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_SHARED_LIBRARY)
 
-endif # don't build in unbundled branches
+endif