diff options
author | Colin Cross <ccross@android.com> | 2017-03-27 16:27:50 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2017-03-27 16:27:50 -0700 |
commit | a929db05b3de44b64dbcaeb2597423c671ac0db6 (patch) | |
tree | 48dfca9fc37101e30c2651931febb8e638fb75d6 | |
parent | dc03a8407e24b5524c0e9fc96336620815516991 (diff) | |
download | build_soong-a929db05b3de44b64dbcaeb2597423c671ac0db6.tar.gz build_soong-a929db05b3de44b64dbcaeb2597423c671ac0db6.tar.bz2 build_soong-a929db05b3de44b64dbcaeb2597423c671ac0db6.zip |
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
-rw-r--r-- | androidmk/cmd/androidmk/android.go | 1 | ||||
-rw-r--r-- | cc/androidmk.go | 8 | ||||
-rw-r--r-- | cc/test.go | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 75c3eecd..331bb4f4 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -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{ diff --git a/cc/androidmk.go b/cc/androidmk.go index f45fbbe5..7acc244b 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -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() @@ -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() { |