Merge "Allow vts config to be packaged in other test suites" am: 24f3c99af8 am: b8acf86cda (97c06861) · Commits · e / os / android_build_soong

android/vts_config.go

+5 −1

Original line number	Diff line number	Diff line
		@@ -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