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 5ca48ae..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
@@ -57,6 +55,7 @@ llvm_post_static_libraries := \
   libLLVMipa \
   libLLVMAnalysis \
   libLLVMTarget \
+  libLLVMMCDisassembler \
   libLLVMMC \
   libLLVMMCParser \
   libLLVMCore \
@@ -64,14 +63,12 @@ llvm_post_static_libraries := \
   libLLVMOption \
   libLLVMSupport \
   libLLVMVectorize \
+  libLLVMProfileData
 
 llvm_host_static_libraries := \
   libLLVMExecutionEngine \
-  libLLVMMCDisassembler \
   libLLVMRuntimeDyld \
-  libLLVMJIT \
-  libLLVMMCJIT \
-  libLLVMProfileData
+  libLLVMMCJIT
 
 ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
 # HOST LLVM shared library build
@@ -123,8 +120,13 @@ 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_aarch64 += $(llvm_aarch64_static_libraries)
-LOCAL_WHOLE_STATIC_LIBRARIES_aarch64 += $(llvm_arm_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)
 
@@ -135,5 +137,3 @@ include $(LLVM_DEVICE_BUILD_MK)
 include $(BUILD_SHARED_LIBRARY)
 
 endif
-
-endif # don't build in unbundled branches