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

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

Merge "Filter out the overridden packages before doing required module expansion."

parents 0d211eb9 84da5c55

core/main.mk

+3 −0
Original line number Diff line number Diff line
@@ -593,6 +593,9 @@ ifdef FULL_BUILD 
  # by the appropriate product definition file, which was included

  # by product_config.make.

  product_MODULES := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES)

  # Filter out the overridden packages before doing expansion

  product_MODULES := $(filter-out $(foreach p, $(product_MODULES), \

      $(PACKAGES.$(p).OVERRIDES)), $(product_MODULES))

  $(call expand-required-modules,product_MODULES,$(product_MODULES))

  product_FILES := $(call module-installed-files, $(product_MODULES))

  ifeq (0,1)