tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow vts config to be packaged in other test suites" am: 24f3c99af8 am: b8acf86cda

Browse source 
Change-Id: Idf504399548dd83a1040d2a40a77889ed17d7f83
This commit is contained in:
Automerger Merge Worker 2020-02-19 22:29:52 +00:00
commit 97c0686199
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/vts_config.go
View file

@ -17,6 +17,7 @@ package android
import (
"fmt"
"io"
"strings"
)
func init() {
@ -26,6 +27,8 @@ func init() {
type vtsConfigProperties struct {
// Override the default (AndroidTest.xml) test manifest file name.
Test_config *string
// Additional test suites to add the test to.
Test_suites []string `android:"arch_variant"`
}
type VtsConfig struct {
@ -50,7 +53,8 @@ func (me *VtsConfig) AndroidMk() AndroidMkData {
fmt.Fprintf(w, "LOCAL_TEST_CONFIG := %s\n",
*me.properties.Test_config)
}
fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE := vts")
fmt.Fprintf(w, "LOCAL_COMPATIBILITY_SUITE := vts %s\n",
strings.Join(me.properties.Test_suites, " "))
},
}
return androidMkData