diff options
author | 2022-12-17 03:40:01 +0000 | |
---|---|---|
committer | 2022-12-17 03:40:01 +0000 | |
commit | 2731ca83777b70b59a7c4ce0265b852d86cfa44e (patch) | |
tree | d7882af2f471f13130c23ea1b4fc9af10cad4282 /java/robolectric.go | |
parent | ed8b52ca27b464259dcf4ffc693e1149ba0cdaf1 (diff) | |
parent | 8ec823cba166a41eb0e9e5ff8fe679e691fec678 (diff) |
Merge "Allow adding extra tradefed options in the Android.bp file"
Diffstat (limited to 'java/robolectric.go')
-rw-r--r-- | java/robolectric.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/java/robolectric.go b/java/robolectric.go index 6e8d5913c..63e05d893 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -131,9 +131,14 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext) r.forceOSType = ctx.Config().BuildOS r.forceArchType = ctx.Config().BuildArch - r.testConfig = tradefed.AutoGenRobolectricTestConfig(ctx, r.testProperties.Test_config, - r.testProperties.Test_config_template, r.testProperties.Test_suites, - r.testProperties.Auto_gen_config) + r.testConfig = tradefed.NewMaybeAutoGenTestConfigBuilder(ctx). + SetTestConfigProp(r.testProperties.Test_config). + SetTestTemplateConfigProp(r.testProperties.Test_config_template). + SetTestSuites(r.testProperties.Test_suites). + SetAutoGenConfig(r.testProperties.Auto_gen_config). + SetDeviceTemplate("${RobolectricTestConfigTemplate}"). + SetHostTemplate("${RobolectricTestConfigTemplate}"). + Build() r.data = android.PathsForModuleSrc(ctx, r.testProperties.Data) roboTestConfig := android.PathForModuleGen(ctx, "robolectric"). |