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

Support test runnner option in auto generated test configs am: 5bde2e2ca9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/26053802

Change-Id: Id8b68d57d95bb72df1e1ff6bf40ec6d35e3bed70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dan Shi
2024-01-30 00:49:29 +00:00
committed by Automerger Merge Worker
parent b68039ca04 5bde2e2ca9
commit 361b6e28ae
4 changed files with 59 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java.go
View File

@@ -931,6 +931,10 @@ type TestOptions struct {
// Extra <option> tags to add to the auto generated test xml file. The "key"
// is optional in each of these.
Tradefed_options []tradefed.Option
// Extra <option> tags to add to the auto generated test xml file under the test runner, e.g., AndroidJunitTest.
// The "key" is optional in each of these.
Test_runner_options []tradefed.Option
}
type testProperties struct {
@@ -1219,6 +1223,7 @@ func (j *Test) generateAndroidBuildActionsWithConfig(ctx android.ModuleContext,
TestSuites: j.testProperties.Test_suites,
Config: configs,
OptionsForAutogenerated: j.testProperties.Test_options.Tradefed_options,
TestRunnerOptions: j.testProperties.Test_options.Test_runner_options,
AutoGenConfig: j.testProperties.Auto_gen_config,
UnitTest: j.testProperties.Test_options.Unit_test,
DeviceTemplate: "${JavaTestConfigTemplate}",