p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

Change-Id: I650bd8e620eb8908fa8851ad1efddb18a7eacf29
This commit is contained in:
Treehugger Robot 2020-07-06 10:30:22 +00:00 committed by Automerger Merge Worker
parent 29dc012e1b 1b97119e6b
commit e7123b456b
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/main.mk
View File

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