diff options
Diffstat (limited to 'shared_llvm.mk')
| -rw-r--r-- | shared_llvm.mk | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk index 797a9b8..3f9e104 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -91,9 +91,10 @@ include $(LLVM_HOST_BUILD_MK) include $(BUILD_HOST_SHARED_LIBRARY) endif -#TODOArm64: Enable llvm build -#TODOMips64: Enable llvm build -ifeq ($(filter $(TARGET_ARCH),arm64 mips64),) +ifeq (,$(filter $(TARGET_ARCH),$(LLVM_SUPPORTED_ARCH))) +$(warning TODO $(TARGET_ARCH): Enable llvm build) +endif + # DEVICE LLVM shared library build include $(CLEAR_VARS) @@ -105,19 +106,10 @@ LOCAL_MODULE_TAGS := optional LOCAL_WHOLE_STATIC_LIBRARIES := \ $(llvm_pre_static_libraries) -ifeq ($(TARGET_ARCH),arm) - LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_arm_static_libraries) -else - ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 x32)) - LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_x86_static_libraries) - else - ifeq ($(TARGET_ARCH),mips) - LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_mips_static_libraries) - else - $(error Unsupported architecture $(TARGET_ARCH)) - endif - endif -endif +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 += $(llvm_post_static_libraries) @@ -127,6 +119,4 @@ LOCAL_SHARED_LIBRARIES := libcutils libdl libstlport include $(LLVM_DEVICE_BUILD_MK) include $(BUILD_SHARED_LIBRARY) -endif # !(arm64 || mips64) - endif # don't build in unbundled branches |