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

Commit 3839f03b authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Add check that a module doesn't try to override itself. 

If that happens it will be left out entirely.

It would be nice to catch this on the Soong level, but there are
several separate code paths there so this ensures it isn't missed.

Test: `m nothing` with packages/modules/ArtPrebuilt/Android.bp that
  had this mistake
Bug: 172480615
Change-Id: I2d31679b2ca5b57bf14f35703c10093275209890
parent e4e328a2

core/main.mk

+5 −1
Original line number Original line 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)

# Expand a list of modules to the modules that they override (if any)

# $(1): The list of modules.

# $(1): The list of modules.

define module-overrides

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

endef





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

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