Commit 279ff055 authored Apr 20, 2021 by Treehugger Robot Committed by Automerger Merge Worker Apr 20, 2021

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

Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." am: 66321c19 am: 759af2af am: 0a0ebf40

Original change: https://android-review.googlesource.com/c/platform/build/+/1679525

Change-Id: I89dd7773cf3af6ac8e8338454d55253192783e27

core/base_rules.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -1005,7 +1005,9 @@ ALL_MODULES.$(my_register_name).TEST_MAINLINE_MODULES := $(LOCAL_TEST_MAINLINE_M
		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)