am 583ec9da: am e84eb7e3: am a6a6c35c: Return "none" if no matching arch found

* commit '583ec9da3e8d6d8ebf83fdba078cba2a0d24af5c':
  Return "none" if no matching arch found
This commit is contained in:
Ying Wang 2014-09-29 19:44:06 +00:00 committed by Android Git Automerger
commit c888b2d106
1 changed files with 4 additions and 2 deletions

View File

@ -2196,11 +2196,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
###########################################################