commit 77dc7d0839c53d76092e7b75ba3c3d4734542bbd
author Tahsin Loqman <tahsinl@google.com> Mon Dec 19 16:27:25 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 19 16:27:25 2022 +0000
tree 1a4a81ebfdcb690ca78693761cd6ed33fb2e1caa
parent 8ec823cba166a41eb0e9e5ff8fe679e691fec678

Revert "Allow adding extra tradefed options in the Android.bp file"

This reverts commit 8ec823cba166a41eb0e9e5ff8fe679e691fec678.

Reason for revert: DroidMonitor: Potential culprit for Bug b/262965953 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I236cc36981d8b30527ca286632727f8ca267e969

java/robolectric.go

diff --git a/java/robolectric.go b/java/robolectric.go
index 6a2d0b3..938abe1 100644
--- a/java/robolectric.go
+++ b/java/robolectric.go
@@ -131,14 +131,9 @@
 	r.forceOSType = ctx.Config().BuildOS
 	r.forceArchType = ctx.Config().BuildArch
 
-	r.testConfig = tradefed.NewMaybeAutoGenTestConfigBuilder(ctx).
-		SetTestConfigProp(r.testProperties.Test_config).
-		SetTestTemplateConfigProp(r.testProperties.Test_config_template).
-		SetTestSuites(r.testProperties.Test_suites).
-		SetAutoGenConfig(r.testProperties.Auto_gen_config).
-		SetDeviceTemplate("${RobolectricTestConfigTemplate}").
-		SetHostTemplate("${RobolectricTestConfigTemplate}").
-		Build()
+	r.testConfig = tradefed.AutoGenRobolectricTestConfig(ctx, r.testProperties.Test_config,
+		r.testProperties.Test_config_template, r.testProperties.Test_suites,
+		r.testProperties.Auto_gen_config)
 	r.data = android.PathsForModuleSrc(ctx, r.testProperties.Data)
 
 	roboTestConfig := android.PathForModuleGen(ctx, "robolectric").