Commit 0f410708 authored Jul 23, 2024 by Automerger Merge Worker

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

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

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

Change-Id: Ic22f65f6ca0010f6df3670c37de7bcdd9996d912
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
		@@ -735,6 +735,14 @@ endif

		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 :=