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

Commit 0e4bbd35 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

Merge "Add check that a module doesn't try to override itself." am: 23e4ab2e 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff6d3825c37fffb017a362f3c2abe3e84a63953f
parents 85a38236 23e4ab2e

core/main.mk

+5 −1
Original line number Diff line number Diff line
@@ -1120,7 +1120,11 @@ $(foreach export,$(EXPORTS_LIST),$(eval $(call add-dependency,$$(EXPORTS.$$(expo 
# Expand a list of modules to the modules that they override (if any)

# $(1): The list of modules.

define module-overrides

$(foreach m,$(1),$(PACKAGES.$(m).OVERRIDES) $(EXECUTABLES.$(m).OVERRIDES) $(SHARED_LIBRARIES.$(m).OVERRIDES) $(ETC.$(m).OVERRIDES))

$(foreach m,$(1),\

  $(eval _mo_overrides := $(PACKAGES.$(m).OVERRIDES) $(EXECUTABLES.$(m).OVERRIDES) $(SHARED_LIBRARIES.$(m).OVERRIDES) $(ETC.$(m).OVERRIDES))\

  $(if $(filter $(m),$(_mo_overrides)),\

    $(error Module $(m) cannot override itself),\

    $(_mo_overrides)))

endef



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