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

Merge "Let get-prebuilt-src-arch return empty if the input is empty"

Browse Source
This commit is contained in:
Ying Wang
2015-10-14 20:41:30 +00:00
committed by Gerrit Code Review
parent 723a26530f 74ccefbee5
commit 191da9bc08
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/definitions.mk
View File

@@ -2515,12 +2515,13 @@ $(if $(call if-build-from-source,$(2),$(3)),$(eval include $(1)))
endef
# Return the arch for the source file of a prebuilt
# Return "none" if no matching arch found, so the result can be passed to
# Return "none" if no matching arch found and return empty
# if the input is empty, 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),none)))
$(if $(filter $(TARGET_2ND_ARCH),$(1)),$(TARGET_2ND_ARCH),$(if $(1),none))))
endef
###########################################################