summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Dan Shi <dshi@google.com> 2024-01-30 00:49:29 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-01-30 00:49:29 +0000
commit361b6e28ae0e45eb1f171f4e829db041a7addfd4 (patch)
tree3bb22e925ee499ce9351b1cad6a555cda6a4b0ea /java/java.go
parentb68039ca0422e30879cec09c0479bf211cd683f1 (diff)
parent5bde2e2ca9997982e8f787dfaeb23e56bbe01915 (diff)
Support test runnner option in auto generated test configs am: 5bde2e2ca9
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>
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go
index c8817e1cb..e7def4b3e 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 {
@@ -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}",