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

Commit c0d5ef77 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix is-board-vendor-qcom: do not return a string consisting of... 

Merge "Fix is-board-vendor-qcom: do not return a string consisting of whitespace." am: dce67554 am: a3960d0d

Original change: https://android-review.googlesource.com/c/platform/build/+/2001770

Change-Id: I023fe1d91bb914c117a82e01dfa46dd4da281c16
parents 270ebd7f a3960d0d

core/product_config.mk

+1 −2
Original line number Diff line number Diff line
@@ -112,8 +112,7 @@ endef 


# Return empty unless the board is QCOM

define is-vendor-board-qcom

$(if $(strip $(TARGET_BOARD_PLATFORM) $(QCOM_BOARD_PLATFORMS)),\

  $(filter $(TARGET_BOARD_PLATFORM),$(QCOM_BOARD_PLATFORMS)),\

$(if $(strip $(TARGET_BOARD_PLATFORM) $(QCOM_BOARD_PLATFORMS)),$(filter $(TARGET_BOARD_PLATFORM),$(QCOM_BOARD_PLATFORMS)),\

  $(error both TARGET_BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM) and QCOM_BOARD_PLATFORMS=$(QCOM_BOARD_PLATFORMS)))

endef