StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jigar Thakkar
2022-12-20 16:24:20 +00:00
committed by Gerrit Code Review
parent 1c6ca94935 77dc7d0839
commit 1d174b185f
10 changed files with 177 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cc/test.go
View File

@@ -415,16 +415,8 @@ func (test *testBinary) install(ctx ModuleContext, file android.Path) {
testInstallBase := getTestInstallBase(useVendor)
configs := getTradefedConfigOptions(ctx, &test.Properties, test.isolated(ctx))
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)
@@ -638,15 +630,8 @@ func (benchmark *benchmarkDecorator) install(ctx ModuleContext, file android.Pat
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())