StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a6a6c35c: Return "none" if no matching arch found

Browse Source 
* commit 'a6a6c35c3afdf9c4bcd05ea5e4c40983e7e49246':
  Return "none" if no matching arch found
This commit is contained in:
Ying Wang
2014-09-26 19:53:25 +00:00
committed by Android Git Automerger
parent 0529b668f3 a6a6c35c3a
commit e84eb7e3e1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/definitions.mk
View File

@@ -2187,11 +2187,13 @@ define include-if-build-from-source
$(if $(call if-build-from-source,$(2),$(3)),$(eval include $(1))) $(if $(call if-build-from-source,$(2),$(3)),$(eval include $(1)))
endef 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 # $(1) the list of archs supported by the prebuilt
define get-prebuilt-src-arch define get-prebuilt-src-arch
$(strip $(if $(filter $(TARGET_ARCH),$(1)),$(TARGET_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 endef
########################################################### ###########################################################