diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/java/java.go b/java/java.go index 9dd585062..dd2437621 100644 --- a/java/java.go +++ b/java/java.go @@ -888,6 +888,10 @@ 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 { @@ -1166,8 +1170,18 @@ func (j *Test) generateAndroidBuildActionsWithConfig(ctx android.ModuleContext, j.testProperties.Test_options.Unit_test = proptools.BoolPtr(defaultUnitTest) } - 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.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.data = android.PathsForModuleSrc(ctx, j.testProperties.Data) @@ -1212,8 +1226,13 @@ func (j *TestHelperLibrary) GenerateAndroidBuildActions(ctx android.ModuleContex } func (j *JavaTestImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { - j.testConfig = tradefed.AutoGenJavaTestConfig(ctx, j.prebuiltTestProperties.Test_config, nil, - j.prebuiltTestProperties.Test_suites, nil, nil, nil) + j.testConfig = tradefed.NewMaybeAutoGenTestConfigBuilder(ctx). + SetTestConfigProp(j.prebuiltTestProperties.Test_config). + SetTestSuites(j.prebuiltTestProperties.Test_suites). + SetDeviceTemplate("${JavaTestConfigTemplate}"). + SetHostTemplate("${JavaHostTestConfigTemplate}"). + SetHostUnitTestTemplate("${JavaHostUnitTestConfigTemplate}"). + Build() j.Import.GenerateAndroidBuildActions(ctx) } |