Merge "[DO NOT MERGE] Build MCTS on mainline branches" into udc-mainline-prod

1 files changed, 6 insertions, 3 deletions

diff --git a/android/androidmk.go b/android/androidmk.go
index aa411d116..ee5ac20a5 100644
--- a/android/androidmk.go
+++ b/android/androidmk.go
@@ -275,14 +275,17 @@ func (a *AndroidMkEntries) AddStrings(name string, value ...string) {
 }
 
 // AddCompatibilityTestSuites adds the supplied test suites to the EntryMap, with special handling
-// for partial MTS test suites.
+// for partial MTS and MCTS test suites.
 func (a *AndroidMkEntries) AddCompatibilityTestSuites(suites ...string) {
-	// MTS supports a full test suite and partial per-module MTS test suites, with naming mts-${MODULE}.
-	// To reduce repetition, if we find a partial MTS test suite without an full MTS test suite,
+	// MT(C)S supports a full test suite and partial per-module MT(C)S test suites, with naming mts-${MODULE}.
+	// To reduce repetition, if we find a partial MT(C)S test suite without an full MTS test suite,
 	// we add the full test suite to our list.
 	if PrefixInList(suites, "mts-") && !InList("mts", suites) {
 		suites = append(suites, "mts")
 	}
+	if PrefixInList(suites, "mcts-") && !InList("mcts", suites) {
+		suites = append(suites, "mcts")
+	}
 	a.AddStrings("LOCAL_COMPATIBILITY_SUITE", suites...)
 }