diff options
Diffstat (limited to 'java/robolectric.go')
| -rw-r--r-- | java/robolectric.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/java/robolectric.go b/java/robolectric.go index cf2bbf8bb..0c11b1c72 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -104,8 +104,6 @@ func (r *robolectricTest) TestSuites() []string { var _ android.TestSuiteModule = (*robolectricTest)(nil) - - func (r *robolectricTest) DepsMutator(ctx android.BottomUpMutatorContext) { r.Library.DepsMutator(ctx) @@ -205,7 +203,7 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext) r.stem = proptools.StringDefault(r.overridableProperties.Stem, ctx.ModuleName()) r.classLoaderContexts = r.usesLibrary.classLoaderContextForUsesLibDeps(ctx) r.dexpreopter.disableDexpreopt() - r.compile(ctx, nil, nil, nil, extraCombinedJars) + javaInfo := r.compile(ctx, nil, nil, nil, extraCombinedJars) installPath := android.PathForModuleInstall(ctx, r.BaseModuleName()) var installDeps android.InstallPaths @@ -242,6 +240,11 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext) } r.installFile = ctx.InstallFile(installPath, ctx.ModuleName()+".jar", r.outputFile, installDeps...) + + if javaInfo != nil { + setExtraJavaInfo(ctx, r, javaInfo) + android.SetProvider(ctx, JavaInfoProvider, javaInfo) + } } func generateSameDirRoboTestConfigJar(ctx android.ModuleContext, outputFile android.ModuleOutPath) { |