commit 877586c8c8d394fe32f54c300ba28a4e5eff9764
author yangbill <yangbill@google.com> Mon Apr 19 20:30:17 2021 +0800
committer yangbill <yangbill@google.com> Mon Apr 19 20:34:07 2021 +0800
tree a3f7e7cfe600f997f94f66dc8096099808161412
parent 2c80511bd60b2f9844fb49d7152f7c265cbe7155

Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined.

To prevent the argument be cleaned if the same module name with
different unit_test value, treat it as unit test if one of the module is
treated as unit tests.

Bug: 176096135
Test: m out/target/product/generic/module-info.json
Change-Id: Iee4ee1063d47dcba1aaf915ec9e4e56f8c7df787

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index c973997..a42d702 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -1005,7 +1005,9 @@
 ifndef LOCAL_IS_HOST_MODULE
 ALL_MODULES.$(my_register_name).FILE_CONTEXTS := $(LOCAL_FILE_CONTEXTS)
 endif
+ifdef LOCAL_IS_UNIT_TEST
 ALL_MODULES.$(my_register_name).IS_UNIT_TEST := $(LOCAL_IS_UNIT_TEST)
+endif
 test_config :=
 
 INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name)