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

[SOONG] Not auto-generate test config if test_suite is cts am: 4f41bc2bed am: 39cfd70a05

Browse Source 
am: 53ff60d314

Change-Id: I801ba32b5f93556f59572f8c6200fd30b34b4e55
This commit is contained in:
yangbill
2019-02-19 06:49:23 -08:00
committed by android-build-merger
parent d315cf337c 53ff60d314
commit a5333fd56c
5 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/app.go
View File

@@ -443,7 +443,7 @@ type AndroidTest struct {
func (a *AndroidTest) GenerateAndroidBuildActions(ctx android.ModuleContext) {
a.generateAndroidBuildActions(ctx)
a.testConfig = tradefed.AutoGenInstrumentationTestConfig(ctx, a.testProperties.Test_config, a.testProperties.Test_config_template, a.manifestPath)
a.testConfig = tradefed.AutoGenInstrumentationTestConfig(ctx, a.testProperties.Test_config, a.testProperties.Test_config_template, a.manifestPath, a.testProperties.Test_suites)
a.data = ctx.ExpandSources(a.testProperties.Data, nil)
}

2
java/java.go
View File

@@ -1527,7 +1527,7 @@ type Test struct {
}
func (j *Test) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config, j.testProperties.Test_config_template)
j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config, j.testProperties.Test_config_template, j.testProperties.Test_suites)
j.data = ctx.ExpandSources(j.testProperties.Data, nil)
j.Library.GenerateAndroidBuildActions(ctx)