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
diff --git a/python/test.go b/python/test.go
index 5781df7..b9b3465 100644
--- a/python/test.go
+++ b/python/test.go
@@ -67,14 +67,9 @@
}
func (test *testDecorator) install(ctx android.ModuleContext, file android.Path) {
- test.testConfig = tradefed.NewMaybeAutoGenTestConfigBuilder(ctx).
- SetTestConfigProp(test.testProperties.Test_config).
- SetTestTemplateConfigProp(test.testProperties.Test_config_template).
- SetTestSuites(test.binaryDecorator.binaryProperties.Test_suites).
- SetAutoGenConfig(test.binaryDecorator.binaryProperties.Auto_gen_config).
- SetDeviceTemplate("${PythonBinaryHostTestConfigTemplate}").
- SetHostTemplate("${PythonBinaryHostTestConfigTemplate}").
- Build()
+ test.testConfig = tradefed.AutoGenPythonBinaryHostTestConfig(ctx, test.testProperties.Test_config,
+ test.testProperties.Test_config_template, test.binaryDecorator.binaryProperties.Test_suites,
+ test.binaryDecorator.binaryProperties.Auto_gen_config)
test.binaryDecorator.pythonInstaller.dir = "nativetest"
test.binaryDecorator.pythonInstaller.dir64 = "nativetest64"