diff options
| author | 2024-01-30 01:32:12 +0000 | |
|---|---|---|
| committer | 2024-01-30 01:32:12 +0000 | |
| commit | 2f5ca3607570fe1a99ebc60ec8b1bf270f012602 (patch) | |
| tree | 9285d8a7525ad7cceaf899454c558e1b29e50563 /java/java.go | |
| parent | 854b033c6b6917519be8eb189813ba294e9f344c (diff) | |
| parent | d1960fc57c42f60e92a50faa17766b576f214077 (diff) | |
Support test runnner option in auto generated test configs am: 5bde2e2ca9 am: d1960fc57c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/26053802
Change-Id: I567314be4ca5e10338a066fced8f509be1d2718e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 683e54682..0eb251815 100644 --- a/java/java.go +++ b/java/java.go @@ -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 { @@ -1213,6 +1217,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}", |