From c5f7b96ab56d0e7fbc42b0c4cdc4d0eeb9a4e1aa Mon Sep 17 00:00:00 2001 From: Tongbo Liu Date: Thu, 4 Jan 2024 09:03:35 +0000 Subject: [PATCH] Enable building whole MCTS and partial MCTS test suites. Bug: 318608673 Test: m mcts Change-Id: I2af74e319c40b0e36d8a71e1da3c6934f66a51be --- android/androidmk.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/android/androidmk.go b/android/androidmk.go index f65e084be..235d7c0d6 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -276,14 +276,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, + // M(C)TS supports a full test suite and partial per-module MTS test suites, with naming mts-${MODULE}. + // To reduce repetition, if we find a partial M(C)TS test suite without an full M(C)TS 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...) }