Commit 4ad483fd authored Jul 23, 2024 by Tongbo Liu Committed by Automerger Merge Worker Jul 23, 2024

Merge "Exclude mcts tests from cts based on the env config." into...

Merge "Exclude mcts tests from cts based on the env config." into android13-tests-dev am: b4a76167 am: 0bb917c0

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

Change-Id: I794e7c072eaa3e289955b37bfad4c9ecc5366c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/base_rules.mk

+8 −0

Original line number	Diff line number	Diff line
		@@ -710,6 +710,14 @@ endif
		ifdef LOCAL_COMPATIBILITY_SUITE
		ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))

		ifeq ($(EXCLUDE_MCTS),true)
		ifneq (,$(test_config))
		ifneq (,$(filter mcts-%,$(LOCAL_COMPATIBILITY_SUITE)))
		LOCAL_COMPATIBILITY_SUITE := $(filter-out cts,$(LOCAL_COMPATIBILITY_SUITE))
		endif
		endif
		endif

		# If we are building a native test or benchmark and its stem variants are not defined,
		# separate the multiple architectures into subdirectories of the testcase folder.
		arch_dir :=