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

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

Browse Source
This commit is contained in:
Treehugger Robot
2022-12-17 03:40:01 +00:00
committed by Gerrit Code Review
parent ed8b52ca27 8ec823cba1
commit 2731ca8377
10 changed files with 232 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/robolectric.go
View File

@@ -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").