diff options
author | 2024-07-18 15:36:32 -0700 | |
---|---|---|
committer | 2024-08-07 14:11:43 -0700 | |
commit | 7727c7f0960886b4302d60256576b2daac56354f (patch) | |
tree | f38f9f93ea915bbeeae38ba883512b5fc06c29d5 /java/robolectric.go | |
parent | d40aac13401a7826c31f50598bd1703ef3c75e67 (diff) |
Convert JavaInfoProvider to *JavaInfo
Convert JavaInfoProvider to return a *JavaInfo instead of a JavaInfo.
This will reduce copying when reading the provider, and also allows
JavaInfo to recursively contain a depset of JavaInfos from
dependencies.
Bug: 308016794
Test: go test ./java/...
Flag: EXEMPT refactor
Change-Id: Ibf6d9b797f760ad1fe815d59839839fdfad91733
Diffstat (limited to 'java/robolectric.go')
-rw-r--r-- | java/robolectric.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/robolectric.go b/java/robolectric.go index 4cad5b153..26f4b7176 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -214,12 +214,13 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext) } handleLibDeps := func(dep android.Module, runtimeOnly bool) { - m, _ := android.OtherModuleProvider(ctx, dep, JavaInfoProvider) if !runtimeOnly { r.libs = append(r.libs, ctx.OtherModuleName(dep)) } if !android.InList(ctx.OtherModuleName(dep), config.FrameworkLibraries) { - combinedJarJars = append(combinedJarJars, m.ImplementationAndResourcesJars...) + if m, ok := android.OtherModuleProvider(ctx, dep, JavaInfoProvider); ok { + combinedJarJars = append(combinedJarJars, m.ImplementationAndResourcesJars...) + } } } |