-# 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
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 \
libLLVMipa \
libLLVMAnalysis \
libLLVMTarget \
+ libLLVMMCDisassembler \
libLLVMMC \
libLLVMMCParser \
libLLVMCore \
libLLVMAsmParser \
libLLVMOption \
libLLVMSupport \
- libLLVMVectorize
+ libLLVMVectorize \
+ libLLVMProfileData \
+ libLLVMLibDriver
llvm_host_static_libraries := \
libLLVMExecutionEngine \
- libLLVMMCDisassembler \
libLLVMRuntimeDyld \
- libLLVMJIT \
- libLLVMMCJIT
+ libLLVMMCJIT \
+ libLLVMOrcJIT
ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
# HOST LLVM shared library build
$(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)
$(warning TODO $(TARGET_ARCH): Enable llvm build)
endif
+ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS))
# DEVICE LLVM shared library build
include $(CLEAR_VARS)
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
-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