diff options
Diffstat (limited to 'java/testing.go')
| -rw-r--r-- | java/testing.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/testing.go b/java/testing.go index c5a0ef390..3989d1987 100644 --- a/java/testing.go +++ b/java/testing.go @@ -588,7 +588,7 @@ func getModuleDependencies(t *testing.T, ctx *android.TestContext, name, variant t.Helper() module := ctx.ModuleForTests(t, name, variant).Module() deps := []string{} - ctx.VisitDirectDeps(module, func(m blueprint.Module) { + ctx.VisitDirectDepsProxies(module, func(m android.ModuleProxy) { deps = append(deps, m.Name()) }) return android.SortedUniqueStrings(deps) @@ -654,9 +654,9 @@ func CheckClasspathFragmentProtoContentInfoProvider(t *testing.T, result *androi func CheckPlatformBootclasspathDependencies(t *testing.T, ctx *android.TestContext, name, variant string, expected []string) { t.Helper() platformBootclasspath := ctx.ModuleForTests(t, name, variant).Module().(*platformBootclasspathModule) - modules := []android.Module{} - ctx.VisitDirectDeps(platformBootclasspath, func(m blueprint.Module) { - modules = append(modules, m.(android.Module)) + modules := []android.ModuleProxy{} + ctx.VisitDirectDepsProxies(platformBootclasspath, func(m android.ModuleProxy) { + modules = append(modules, m) }) pairs := apexNamePairsFromModules(ctx, modules, platformBootclasspath.libraryToApex) @@ -664,7 +664,7 @@ func CheckPlatformBootclasspathDependencies(t *testing.T, ctx *android.TestConte } // apexNamePairsFromModules returns the apex:module pair for the supplied modules. -func apexNamePairsFromModules(ctx *android.TestContext, modules []android.Module, modulesToApex map[android.Module]string) []string { +func apexNamePairsFromModules(ctx *android.TestContext, modules []android.ModuleProxy, modulesToApex map[android.ModuleProxy]string) []string { pairs := []string{} for _, module := range modules { pairs = append(pairs, apexNamePairFromModule(ctx, module, modulesToApex)) @@ -673,7 +673,7 @@ func apexNamePairsFromModules(ctx *android.TestContext, modules []android.Module } // ApexFragmentPairsFromModules returns the apex:fragment pair for the supplied fragments. -func ApexFragmentPairsFromModules(ctx *android.TestContext, fragments []android.Module, apexNameToFragment map[string]android.Module) []string { +func ApexFragmentPairsFromModules(ctx *android.TestContext, fragments []android.ModuleProxy, apexNameToFragment map[string]android.ModuleProxy) []string { pairs := []string{} for _, fragment := range fragments { found := false @@ -690,7 +690,7 @@ func ApexFragmentPairsFromModules(ctx *android.TestContext, fragments []android. return pairs } -func apexNamePairFromModule(ctx *android.TestContext, module android.Module, modulesToApex map[android.Module]string) string { +func apexNamePairFromModule(ctx *android.TestContext, module android.ModuleProxy, modulesToApex map[android.ModuleProxy]string) string { name := module.Name() apex := modulesToApex[module] if apex == "" { |