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

Commit ab5c9cdb authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Bypass LOCAL_*_REQUIRED_MODULES checks for ONE_SHOT_MAKEFILE" 

am: 6ae79673

Change-Id: I357836bb2291caf33101a1cfb2189a1000310e88
parents ed23146c 6ae79673

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)\

      )\