Add support for test_suites property on cc_test modules

Add a test_suites property that is passed through to make as
LOCAL_COMPATIBILITY_SUITES.

Test: m -j checkbuild, examine out/soong/Android-${TARGET_PRODUCT}.mk
Bug: 35394669
Change-Id: If05b0f5f7d6dd85228546123bebe32859bcc8186
This commit is contained in:
Colin Cross
2017-03-27 16:27:50 -07:00
parent dc03a8407e
commit a929db05b3
3 changed files with 14 additions and 0 deletions

View File

@@ -103,6 +103,7 @@ func init() {
"LOCAL_AIDL_INCLUDES": "aidl_includes",
"LOCAL_AAPT_FLAGS": "aaptflags",
"LOCAL_PACKAGE_SPLITS": "package_splits",
"LOCAL_COMPATIBILITY_SUITE": "test_suites",
})
addStandardProperties(bpparser.BoolType,
map[string]string{

View File

@@ -200,6 +200,14 @@ func (test *testBinary) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkDa
ret.SubName = "_" + test.binaryDecorator.Properties.Stem
}
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error {
if len(test.Properties.Test_suites) > 0 {
fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITES :=",
strings.Join(test.Properties.Test_suites, " "))
}
return nil
})
var testFiles []string
for _, d := range test.data {
rel := d.Rel()

View File

@@ -20,6 +20,7 @@ import (
"strings"
"android/soong/android"
"github.com/google/blueprint"
)
@@ -41,6 +42,10 @@ type TestBinaryProperties struct {
// list of files or filegroup modules that provide data that should be installed alongside
// the test
Data []string
// list of compatibility suites (for example "cts", "vts") that the module should be
// installed into.
Test_suites []string
}
func init() {