diff options
Diffstat (limited to 'shared_llvm.mk')
-rw-r--r-- | shared_llvm.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk index 1e1de02..11a1cfe 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -1,6 +1,3 @@ -# Don't build the library in unbundled branches. -ifeq (,$(TARGET_BUILD_APPS)) - LOCAL_PATH:= $(call my-dir) llvm_pre_static_libraries := \ @@ -127,6 +124,11 @@ 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 @@ -136,5 +138,3 @@ include $(LLVM_DEVICE_BUILD_MK) include $(BUILD_SHARED_LIBRARY) endif - -endif # don't build in unbundled branches |