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

27
java/java.go
View File

@@ -910,10 +910,6 @@ type TestOptions struct {
// a list of extra test configuration files that should be installed with the module.
Extra_test_configs []string `android:"path,arch_variant"`
// Extra <option> tags to add to the auto generated test xml file. The "key"
// is optional in each of these.
Tradefed_options []tradefed.Option
}
type testProperties struct {
@@ -1192,18 +1188,8 @@ func (j *Test) generateAndroidBuildActionsWithConfig(ctx android.ModuleContext,
j.testProperties.Test_options.Unit_test = proptools.BoolPtr(defaultUnitTest)
}
j.testConfig = tradefed.NewMaybeAutoGenTestConfigBuilder(ctx).
SetTestConfigProp(j.testProperties.Test_config).
SetTestTemplateConfigProp(j.testProperties.Test_config_template).
SetTestSuites(j.testProperties.Test_suites).
SetConfig(configs).
SetOptionsForAutogenerated(j.testProperties.Test_options.Tradefed_options).
SetAutoGenConfig(j.testProperties.Auto_gen_config).
SetUnitTest(j.testProperties.Test_options.Unit_test).
SetDeviceTemplate("${JavaTestConfigTemplate}").
SetHostTemplate("${JavaHostTestConfigTemplate}").
SetHostUnitTestTemplate("${JavaHostUnitTestConfigTemplate}").
Build()
j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.testProperties.Test_config, j.testProperties.Test_config_template,
j.testProperties.Test_suites, configs, j.testProperties.Auto_gen_config, j.testProperties.Test_options.Unit_test)
j.data = android.PathsForModuleSrc(ctx, j.testProperties.Data)
@@ -1248,13 +1234,8 @@ func (j *TestHelperLibrary) GenerateAndroidBuildActions(ctx android.ModuleContex
}
func (j *JavaTestImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
j.testConfig = tradefed.NewMaybeAutoGenTestConfigBuilder(ctx).
SetTestConfigProp(j.prebuiltTestProperties.Test_config).
SetTestSuites(j.prebuiltTestProperties.Test_suites).
SetDeviceTemplate("${JavaTestConfigTemplate}").
SetHostTemplate("${JavaHostTestConfigTemplate}").
SetHostUnitTestTemplate("${JavaHostUnitTestConfigTemplate}").
Build()
j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.prebuiltTestProperties.Test_config, nil,
j.prebuiltTestProperties.Test_suites, nil, nil, nil)
j.Import.GenerateAndroidBuildActions(ctx)
}