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/cc/test.go b/cc/test.go
index ed2a58a..536210b 100644
--- a/cc/test.go
+++ b/cc/test.go
@@ -459,16 +459,8 @@
configs = append(configs, tradefed.Object{"module_controller", "com.android.tradefed.testtype.suite.module.MinApiLevelModuleController", options})
}
- test.testConfig = tradefed.NewMaybeAutoGenTestConfigBuilder(ctx).
- SetTestConfigProp(test.Properties.Test_config).
- SetTestTemplateConfigProp(test.Properties.Test_config_template).
- SetTestSuites(test.testDecorator.InstallerProperties.Test_suites).
- SetConfig(configs).
- SetAutoGenConfig(test.Properties.Auto_gen_config).
- SetTestInstallBase(testInstallBase).
- SetDeviceTemplate("${NativeTestConfigTemplate}").
- SetHostTemplate("${NativeHostTestConfigTemplate}").
- Build()
+ test.testConfig = tradefed.AutoGenNativeTestConfig(ctx, test.Properties.Test_config,
+ test.Properties.Test_config_template, test.testDecorator.InstallerProperties.Test_suites, configs, test.Properties.Auto_gen_config, testInstallBase)
test.extraTestConfigs = android.PathsForModuleSrc(ctx, test.Properties.Test_options.Extra_test_configs)
@@ -624,15 +616,8 @@
if Bool(benchmark.Properties.Require_root) {
configs = append(configs, tradefed.Object{"target_preparer", "com.android.tradefed.targetprep.RootTargetPreparer", nil})
}
- benchmark.testConfig = tradefed.NewMaybeAutoGenTestConfigBuilder(ctx).
- SetTestConfigProp(benchmark.Properties.Test_config).
- SetTestTemplateConfigProp(benchmark.Properties.Test_config_template).
- SetTestSuites(benchmark.Properties.Test_suites).
- SetConfig(configs).
- SetAutoGenConfig(benchmark.Properties.Auto_gen_config).
- SetDeviceTemplate("${NativeBenchmarkTestConfigTemplate}").
- SetHostTemplate("${NativeBenchmarkTestConfigTemplate}").
- Build()
+ benchmark.testConfig = tradefed.AutoGenNativeBenchmarkTestConfig(ctx, benchmark.Properties.Test_config,
+ benchmark.Properties.Test_config_template, benchmark.Properties.Test_suites, configs, benchmark.Properties.Auto_gen_config)
benchmark.binaryDecorator.baseInstaller.dir = filepath.Join("benchmarktest", ctx.ModuleName())
benchmark.binaryDecorator.baseInstaller.dir64 = filepath.Join("benchmarktest64", ctx.ModuleName())