For android-mcts-<module>.zip, we use mts-tradefed.
For android-mcts.zip, we use mcts-tradefed.
Ignore-AOSP-First: test for mainline internal use
Change-Id: Id5c41d525574c8f4787fb0f94adc0db0f4ccfd38
Test: m mcts
Bug: 354254853
diff --git a/core/tasks/mcts.mk b/core/tasks/mcts.mk
index b858823..02e916a 100644
--- a/core/tasks/mcts.mk
+++ b/core/tasks/mcts.mk
@@ -15,12 +15,23 @@
ifneq ($(wildcard test/mts/README.md),)
mcts_test_suites :=
-mcts_test_suites += mcts
+mcts_all_test_suites :=
+mcts_all_test_suites += mcts
$(foreach module, $(mts_modules), $(eval mcts_test_suites += mcts-$(module)))
$(foreach suite, $(mcts_test_suites), \
$(eval test_suite_name := $(suite)) \
+ $(eval test_suite_tradefed := mts-tradefed) \
+ $(eval test_suite_readme := test/mts/README.md) \
+ $(eval include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk) \
+ $(eval .PHONY: $(suite)) \
+ $(eval $(suite): $(compatibility_zip)) \
+ $(eval $(call dist-for-goals, $(suite), $(compatibility_zip))) \
+)
+
+$(foreach suite, $(mcts_all_test_suites), \
+ $(eval test_suite_name := $(suite)) \
$(eval test_suite_tradefed := mcts-tradefed) \
$(eval test_suite_readme := test/mts/README.md) \
$(eval include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk) \