commit 66321c193b43bb77bbe13a976da1cd5d20ad8671
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 20 01:16:45 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 20 01:16:45 2021 +0000
tree 701002951d7b2f9fd59aed98a081edb42e7db3a7
parent b4863637a221ea8173e19ed61cc3654611c94c1f
parent 877586c8c8d394fe32f54c300ba28a4e5eff9764

Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined."

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)