diff options
| author | Liz Kammer <eakammer@google.com> | 2020-11-24 12:42:58 -0800 |
|---|---|---|
| committer | Liz Kammer <eakammer@google.com> | 2020-12-01 12:23:56 -0800 |
| commit | 57f5b33ad3c0b1d027e258d1633ef2a4a6de24e4 (patch) | |
| tree | 3021b276c768128db56759011bf8ba6792454741 /python | |
| parent | fdea25781f72a2f15fdad0bacc633a6c8f255fec (diff) | |
Add test suite handling to central androidmk code
MTS is introducing partial MTS test suites that are per-module, with
names of the format: mts-${MODULE}. By centralizing the code for test
suites, we can automatically add "mts" test suite when an
"mts-${MODULE}" test suite is specified, reducing duplication.
Test: m mts
Bug: 170318013
Change-Id: I8ce9d3c252fcc0a937bb5f2826d21cb6c6932d82
Diffstat (limited to 'python')
| -rw-r--r-- | python/androidmk.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/androidmk.go b/python/androidmk.go index e60c5385b..60637d39a 100644 --- a/python/androidmk.go +++ b/python/androidmk.go @@ -49,7 +49,7 @@ func (p *binaryDecorator) AndroidMk(base *Module, entries *android.AndroidMkEntr entries.Class = "EXECUTABLES" entries.ExtraEntries = append(entries.ExtraEntries, func(entries *android.AndroidMkEntries) { - entries.AddStrings("LOCAL_COMPATIBILITY_SUITE", p.binaryProperties.Test_suites...) + entries.AddCompatibilityTestSuites(p.binaryProperties.Test_suites...) }) base.subAndroidMk(entries, p.pythonInstaller) } @@ -58,7 +58,7 @@ func (p *testDecorator) AndroidMk(base *Module, entries *android.AndroidMkEntrie entries.Class = "NATIVE_TESTS" entries.ExtraEntries = append(entries.ExtraEntries, func(entries *android.AndroidMkEntries) { - entries.AddStrings("LOCAL_COMPATIBILITY_SUITE", p.binaryDecorator.binaryProperties.Test_suites...) + entries.AddCompatibilityTestSuites(p.binaryDecorator.binaryProperties.Test_suites...) if p.testConfig != nil { entries.SetString("LOCAL_FULL_TEST_CONFIG", p.testConfig.String()) } |