From 5bde2e2ca9997982e8f787dfaeb23e56bbe01915 Mon Sep 17 00:00:00 2001
From: Dan Shi <dshi@google.com>
Date: Fri, 26 May 2023 04:21:44 +0000
Subject: Support test runnner option in auto generated test configs

Bug: 284179405
Bug: 236980335
Test: unittest
Change-Id: Ifae3d556ff79153ca6c3067347fc259b665fb2e1
Merged-In: Ifae3d556ff79153ca6c3067347fc259b665fb2e1
---
 java/java.go | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'java/java.go')

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}",
-- 
cgit v1.2.3-59-g8ed1b