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

Commit 34ec0cb0 authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Fix missing modules check for dont_bother goals" am: f9b6cd65 

am: c61bed91

Change-Id: I18623ca6f24e3f1aa0b91e0f6b0beaa79fb74643
parents 39e785ff c61bed91

core/main.mk

+21 −20
Original line number Diff line number Diff line
@@ -1144,7 +1144,10 @@ $(if $(strip $(1)), \ 
)

endef



ifeq (true|,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_PACKAGES_EXIST)|$(filter true,$(ALLOW_MISSING_DEPENDENCIES)))

ifdef FULL_BUILD

  ifneq (true,$(ALLOW_MISSING_DEPENDENCIES))

    # Check to ensure that all modules in PRODUCT_PACKAGES exist (opt in per product)

    ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_PACKAGES_EXIST))

      _whitelist := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_PACKAGES_EXIST_WHITELIST)

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

      # Sanity check all modules in PRODUCT_PACKAGES exist. We check for the
@@ -1158,13 +1161,11 @@ ifeq (true|,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_PACKAGES_EXIST)|$(fil 
        $(INTERNAL_PRODUCT) includes redundant whitelist entries for nonexistant PRODUCT_PACKAGES)

    endif



ifdef FULL_BUILD

    # Check to ensure that all modules in PRODUCT_HOST_PACKAGES exist

    #

    # Many host modules are Linux-only, so skip this check on Mac. If we ever have Mac-only modules,

    # maybe it would make sense to have PRODUCT_HOST_PACKAGES_LINUX/_DARWIN?

    ifneq ($(HOST_OS),darwin)

    ifneq (true,$(ALLOW_MISSING_DEPENDENCIES))

      _modules := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_HOST_PACKAGES)

      _nonexistant_modules := $(foreach m,$(_modules),\

        $(if $(filter FAKE,$(ALL_MODULES.$(m).CLASS))$(filter $(HOST_OUT_ROOT)/%,$(ALL_MODULES.$(m).INSTALLED)),,$(m)))