Merge "Use _WIN32 rather than WIN32."

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

diff --git a/shared_llvm.mk b/shared_llvm.mk
index ff62966..183618c 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -1,11 +1,10 @@
-# Don't build the library in unbundled branches.
-ifeq (,$(TARGET_BUILD_APPS))
-
 LOCAL_PATH:= $(call my-dir)
 
 llvm_pre_static_libraries := \
   libLLVMLinker \
   libLLVMipo \
+  libLLVMDebugInfoDWARF \
+  libLLVMDebugInfoPDB \
   libLLVMIRReader \
   libLLVMBitWriter \
   libLLVMBitReader
@@ -35,14 +34,14 @@ llvm_mips_static_libraries := \
   libLLVMMipsAsmPrinter \
   libLLVMMipsDisassembler
 
-llvm_arm64_static_libraries := \
-  libLLVMARM64CodeGen \
-  libLLVMARM64Info \
-  libLLVMARM64Desc \
-  libLLVMARM64AsmParser \
-  libLLVMARM64AsmPrinter \
-  libLLVMARM64Utils \
-  libLLVMARM64Disassembler
+llvm_aarch64_static_libraries := \
+  libLLVMAArch64CodeGen \
+  libLLVMAArch64Info \
+  libLLVMAArch64Desc \
+  libLLVMAArch64AsmParser \
+  libLLVMAArch64AsmPrinter \
+  libLLVMAArch64Utils \
+  libLLVMAArch64Disassembler
 
 llvm_post_static_libraries := \
   libLLVMAsmPrinter \
@@ -57,6 +56,7 @@ llvm_post_static_libraries := \
   libLLVMipa \
   libLLVMAnalysis \
   libLLVMTarget \
+  libLLVMMCDisassembler \
   libLLVMMC \
   libLLVMMCParser \
   libLLVMCore \
@@ -64,14 +64,14 @@ llvm_post_static_libraries := \
   libLLVMOption \
   libLLVMSupport \
   libLLVMVectorize \
+  libLLVMProfileData \
+  libLLVMLibDriver
 
 llvm_host_static_libraries := \
   libLLVMExecutionEngine \
-  libLLVMMCDisassembler \
   libLLVMRuntimeDyld \
-  libLLVMJIT \
   libLLVMMCJIT \
-  libLLVMProfileData
+  libLLVMOrcJIT
 
 ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
 # HOST LLVM shared library build
@@ -88,12 +88,12 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
   $(llvm_arm_static_libraries) \
   $(llvm_x86_static_libraries) \
   $(llvm_mips_static_libraries) \
-  $(llvm_arm64_static_libraries) \
+  $(llvm_aarch64_static_libraries) \
   $(llvm_host_static_libraries) \
   $(llvm_post_static_libraries)
 
 ifeq ($(HOST_OS),windows)
-  LOCAL_LDLIBS := -limagehlp -lpsapi
+  LOCAL_LDLIBS := -limagehlp -lpsapi -lole32
 else
   LOCAL_LDLIBS := -ldl -lpthread
 endif
@@ -122,9 +122,17 @@ 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_arm64 += $(llvm_arm64_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 += $(llvm_aarch64_static_libraries)
+LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_arm_static_libraries)
+LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_aarch64_static_libraries)
+endif
+
 LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries)
 
 #LOCAL_LDLIBS := -ldl -lpthread
@@ -134,5 +142,3 @@ include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_SHARED_LIBRARY)
 
 endif
-
-endif # don't build in unbundled branches