diff --git a/core/definitions.mk b/core/definitions.mk index b4ce2c30a..a9fc155e2 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2195,11 +2195,13 @@ define include-if-build-from-source $(if $(call if-build-from-source,$(2),$(3)),$(eval include $(1))) endef -## Return the arch for the source file of a prebuilt +# Return the arch for the source file of a prebuilt +# Return "none" if no matching arch found, so the result can be passed to +# LOCAL_MODULE_TARGET_ARCH. # $(1) the list of archs supported by the prebuilt define get-prebuilt-src-arch $(strip $(if $(filter $(TARGET_ARCH),$(1)),$(TARGET_ARCH),\ - $(if $(filter $(TARGET_2ND_ARCH),$(1)),$(TARGET_2ND_ARCH)))) + $(if $(filter $(TARGET_2ND_ARCH),$(1)),$(TARGET_2ND_ARCH),none))) endef ###########################################################