StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support 'test_config' into soong modules

Browse Source 
Test: make general-tests
Bug: 110982517
Change-Id: Ib2eab2653fdfce6f699b85c9fbc64558b6d40363
This commit is contained in:
Julien Desprez
2018-08-02 15:00:46 -07:00
parent 6bfe4eb42c
commit e146e39fa6
6 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/androidmk.go
View File

@@ -248,6 +248,10 @@ func (benchmark *benchmarkDecorator) AndroidMk(ctx AndroidMkContext, ret *androi
fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=",
strings.Join(benchmark.Properties.Test_suites, " "))
}
if benchmark.Properties.Test_config != nil {
fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=",
benchmark.Properties.Test_config)
}
fmt.Fprintln(w, "LOCAL_NATIVE_BENCHMARK := true")
})
@@ -266,6 +270,10 @@ func (test *testBinary) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkDa
fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=",
strings.Join(test.Properties.Test_suites, " "))
}
if test.Properties.Test_config != nil {
fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=",
test.Properties.Test_config)
}
})
androidMkWriteTestData(test.data, ctx, ret)

10
cc/test.go
View File

@@ -44,6 +44,10 @@ type TestBinaryProperties struct {
// list of compatibility suites (for example "cts", "vts") that the module should be
// installed into.
Test_suites []string `android:"arch_variant"`
// the name of the test configuration (for example "AndroidTest.xml") that should be
// installed with the module.
Test_config *string `android:"arch_variant"`
}
func init() {
@@ -304,7 +308,11 @@ type BenchmarkProperties struct {
// list of compatibility suites (for example "cts", "vts") that the module should be
// installed into.
Test_suites []string
Test_suites []string `android:"arch_variant"`
// the name of the test configuration (for example "AndroidTest.xml") that should be
// installed with the module.
Test_config *string `android:"arch_variant"`
}
type benchmarkDecorator struct {