-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
+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_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)