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

Commit ab832444 authored by Colin Cross's avatar Colin Cross
Browse files

Bypass LOCAL_*_REQUIRED_MODULES checks for ONE_SHOT_MAKEFILE 

When ONE_SHOT_MAKEFILE is set, the targets of LOCAL_*_REQUIRED_MODULES
may not exist, so skip the error message.

Fixes: 131241991
Test: mmm cts/tests/signature/intent-check
Change-Id: I95c4c901610746854179af8486c8c4767dd18864
parent 4534fcca

core/main.mk

+2 −2
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ $(foreach m,$(ALL_MODULES), \ 
    $(eval req_files := )\

    $(foreach req_mod,$(req_mods), \

      $(eval req_file := $(filter $(TARGET_OUT_ROOT)/%, $(call module-installed-files,$(req_mod)))) \

      $(if $(strip $(req_file)),\

      $(if $(strip $(req_file))$(ONE_SHOT_MAKEFILE),\

        ,\

        $(error $(m).LOCAL_TARGET_REQUIRED_MODULES : illegal value $(req_mod) : not a device module. If you want to specify host modules to be required to be installed along with your host module, add those module names to LOCAL_REQUIRED_MODULES instead)\

      )\
@@ -740,7 +740,7 @@ $(foreach m,$(ALL_MODULES), \ 
    $(eval req_files := )\

    $(foreach req_mod,$(req_mods), \

      $(eval req_file := $(filter $(HOST_OUT)/%, $(call module-installed-files,$(req_mod)))) \

      $(if $(strip $(req_file)),\

      $(if $(strip $(req_file))$(ONE_SHOT_MAKEFILE),\

        ,\

        $(error $(m).LOCAL_HOST_REQUIRED_MODULES : illegal value $(req_mod) : not a host module. If you want to specify target modules to be required to be installed along with your target module, add those module names to LOCAL_REQUIRED_MODULES instead)\

      )\