summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Dan Shi <dshi@google.com> 2023-05-26 04:21:44 +0000
committer Steven Moreland <smoreland@google.com> 2024-01-29 23:19:39 +0000
commit5bde2e2ca9997982e8f787dfaeb23e56bbe01915 (patch)
treecc1d7d996ab63b9f5b2023b8e854c9528db8a699 /java/java.go
parentc41de47a9cc2b6cadfa38d998659a16ff89d2b8d (diff)
Support test runnner option in auto generated test configs
Bug: 284179405 Bug: 236980335 Test: unittest Change-Id: Ifae3d556ff79153ca6c3067347fc259b665fb2e1 Merged-In: Ifae3d556ff79153ca6c3067347fc259b665fb2e1
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 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}",