openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

target-host-required: Be permissive when ALLOW_MISSING_DEPENDENCY is set 

add-all-host-to-target-required-modules-deps and
add-all-target-to-host-required-modules-deps permit errors when
ALLOW_MISSING_DEPENDENCY is set to true.

The previous behavior may break when doing unbundled builds.

Bug: 160318430
Bug: 7456955
Test: TH art-target-arm build pass
Change-Id: I00818d27ce18f4072eff9fa98958be820b5cd1f8
This commit is contained in:
Yo Chiang 2020-07-02 11:44:37 +08:00
parent c60b00c5b7
commit 2c7c8bb657
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 := )\ $(eval req_files := )\
$(foreach req_mod,$(req_mods), \ $(foreach req_mod,$(req_mods), \
$(eval req_file := $(filter $(TARGET_OUT_ROOT)/%, $(call module-installed-files,$(req_mod)))) \ $(eval req_file := $(filter $(TARGET_OUT_ROOT)/%, $(call module-installed-files,$(req_mod)))) \
$(if $(strip $(req_file)),\ $(if $(filter true,$(ALLOW_MISSING_DEPENDENCIES)), \
,\ , \
$(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 $(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 := $(req_files)$(space)$(req_file))\
)\ )\
$(eval req_files := $(strip $(req_files)))\ $(eval req_files := $(strip $(req_files)))\
@ -807,10 +810,13 @@ $(foreach m,$(ALL_MODULES), \
$(eval req_files := )\ $(eval req_files := )\
$(foreach req_mod,$(req_mods), \ $(foreach req_mod,$(req_mods), \
$(eval req_file := $(filter $(HOST_OUT)/%, $(call module-installed-files,$(req_mod)))) \ $(eval req_file := $(filter $(HOST_OUT)/%, $(call module-installed-files,$(req_mod)))) \
$(if $(strip $(req_file)),\ $(if $(filter true,$(ALLOW_MISSING_DEPENDENCIES)), \
,\ , \
$(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 $(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 := $(req_files)$(space)$(req_file))\
)\ )\
$(eval req_files := $(strip $(req_files)))\ $(eval req_files := $(strip $(req_files)))\