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

Commit 2ad18360 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "target-host-required: Be permissive when ALLOW_MISSING_DEPENDENCY is... 

Merge "target-host-required: Be permissive when ALLOW_MISSING_DEPENDENCY is set" am: 19950004 am: 1b97119e am: e7123b45

Original change: https://android-review.googlesource.com/c/platform/build/+/1354465

Change-Id: I0803e436a07d10f7ff60124ea617b4136186ee87
parents 9cb60b28 e7123b45

core/main.mk

+14 −8
Original line number Diff line number Diff line
@@ -781,10 +781,13 @@ $(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 $(filter true,$(ALLOW_MISSING_DEPENDENCIES)), \

        , \

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

          , \

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

        ) \

      ) \

      $(eval req_files := $(req_files)$(space)$(req_file))\

    )\

    $(eval req_files := $(strip $(req_files)))\
@@ -807,10 +810,13 @@ $(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 $(filter true,$(ALLOW_MISSING_DEPENDENCIES)), \

        , \

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

          , \

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

        ) \

      ) \

      $(eval req_files := $(req_files)$(space)$(req_file))\

    )\

    $(eval req_files := $(strip $(req_files)))\