From 7e1a854d082b9b11aae23c8ed22ff3596deee7cc Mon Sep 17 00:00:00 2001 From: Tongbo Liu Date: Thu, 25 Jul 2024 07:54:16 +0000 Subject: [PATCH] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 Bug: 345592291 Change-Id: I4b72c270d36a1fd2785494814b8a953d40784941 Test: m mcts --- android/androidmk.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/android/androidmk.go b/android/androidmk.go index aa411d116..762abdef4 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, + // 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...) }