commit 343d54bb658724286bf0e9d9a1b8494cc30a73a0
author Colin Cross <ccross@android.com> Sat May 18 01:22:36 2019 -0700
committer android-build-merger <android-build-merger@google.com> Sat May 18 01:22:36 2019 -0700
tree 31a0bdab0bf93550430e22036e656c783fe324d2
parent bcc1ec7508eec993c064e14ecdfba38623f7dc1b
parent fc42ce6603da22f9227582c753d6035267eeb2b4

Merge "Bypass LOCAL_*_REQUIRED_MODULES checks for ONE_SHOT_MAKEFILE" am: 6ae7967309 am: ab5c9cdbb1 am: 8ab6df3f2d
am: fc42ce6603

Change-Id: I05e37d2cc67b22848c95911c34611a0846c68a19

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 656a6ec..0225c89 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -714,7 +714,7 @@
     $(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 @@
     $(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)\
       )\