diff --git a/core/base_rules.mk b/core/base_rules.mk index ddbfe3fc83..893091aa5d 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -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 :=