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

This reverts commit 8ec823cba1.

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
This commit is contained in:
Tahsin Loqman
2022-12-19 16:27:25 +00:00
committed by Gerrit Code Review
parent 8ec823cba1
commit 77dc7d0839
10 changed files with 177 additions and 232 deletions

View File

@@ -67,14 +67,9 @@ func (test *testDecorator) bootstrapperProps() []interface{} {
}
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"