StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bypass LOCAL_*_REQUIRED_MODULES checks for ONE_SHOT_MAKEFILE" am: 6ae7967309

Browse Source 
am: ab5c9cdbb1

Change-Id: Ibb87d9e0ac6a1b0f7cff1873b3d2bf4d1dd351fb
This commit is contained in:
Colin Cross
2019-05-17 22:27:53 -07:00
committed by android-build-merger
parent c102e88864 ab5c9cdbb1
commit 8ab6df3f2d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/main.mk
View File

@@ -714,7 +714,7 @@ $(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 $(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)\ $(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 := )\ $(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 $(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)\ $(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)\
)\ )\