Commit 455b3394 authored Jul 15, 2024 by Tongbo Liu Committed by Automerger Merge Worker Jul 15, 2024

RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP...

RESTRICT AUTOMERGE: Exclude mcts tests from cts based on the env config, a CP from aosp/3081046. am: b60ebe0d

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

Change-Id: I6aba6262e8d344b45e05787e63810cc990b952e3
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
		@@ -725,6 +725,14 @@ else
		test_config := $(wildcard $(LOCAL_PATH)/AndroidTest.xml)
		endif

		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

		ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))

		# If we are building a native test or benchmark and its stem variants are not defined,