Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 191da9bc authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

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

parents 723a2653 74ccefbe
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -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

###########################################################