diff options
| author | 2025-01-15 18:14:34 +0000 | |
|---|---|---|
| committer | 2025-01-15 12:06:06 -0800 | |
| commit | 80b68c44cac5bead6f247f9026238338ee62302f (patch) | |
| tree | 485038efb37a53911a68bc36aa30572d3c5b8517 | |
| parent | 2ce2b5a34aaf17684694a97be19e2d3ec0f31127 (diff) | |
Convert initHiddenAPI, lint and proguardBuildActions to use ModuleProxy.
Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: Icde6331533685be54f7ee2e86696da05a77431b6
| -rw-r--r-- | java/app.go | 2 | ||||
| -rw-r--r-- | java/hiddenapi.go | 2 | ||||
| -rw-r--r-- | java/lint.go | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/java/app.go b/java/app.go index 6a4cd4b16..795eed1dc 100644 --- a/java/app.go +++ b/java/app.go @@ -673,7 +673,7 @@ func (a *AndroidApp) aaptBuildActions(ctx android.ModuleContext) { func (a *AndroidApp) proguardBuildActions(ctx android.ModuleContext) { var staticLibProguardFlagFiles android.Paths - ctx.VisitDirectDeps(func(m android.Module) { + ctx.VisitDirectDepsProxy(func(m android.ModuleProxy) { depProguardInfo, _ := android.OtherModuleProvider(ctx, m, ProguardSpecInfoProvider) staticLibProguardFlagFiles = append(staticLibProguardFlagFiles, depProguardInfo.UnconditionallyExportedProguardFlags.ToList()...) if ctx.OtherModuleDependencyTag(m) == staticLibTag { diff --git a/java/hiddenapi.go b/java/hiddenapi.go index b1a9debe1..c9a1f2bbe 100644 --- a/java/hiddenapi.go +++ b/java/hiddenapi.go @@ -97,7 +97,7 @@ func (h *hiddenAPI) initHiddenAPI(ctx android.ModuleContext, dexJar OptionalDexJ // Save the classes jars even if this is not active as they may be used by modular hidden API // processing. classesJars := android.Paths{classesJar} - ctx.VisitDirectDepsWithTag(hiddenApiAnnotationsTag, func(dep android.Module) { + ctx.VisitDirectDepsProxyWithTag(hiddenApiAnnotationsTag, func(dep android.ModuleProxy) { if javaInfo, ok := android.OtherModuleProvider(ctx, dep, JavaInfoProvider); ok { classesJars = append(classesJars, javaInfo.ImplementationJars...) } diff --git a/java/lint.go b/java/lint.go index cee25a8d5..3838745e4 100644 --- a/java/lint.go +++ b/java/lint.go @@ -398,7 +398,7 @@ func (l *linter) lint(ctx android.ModuleContext) { } } - extraLintCheckModules := ctx.GetDirectDepsWithTag(extraLintCheckTag) + extraLintCheckModules := ctx.GetDirectDepsProxyWithTag(extraLintCheckTag) for _, extraLintCheckModule := range extraLintCheckModules { if dep, ok := android.OtherModuleProvider(ctx, extraLintCheckModule, JavaInfoProvider); ok { l.extraLintCheckJars = append(l.extraLintCheckJars, dep.ImplementationAndResourcesJars...) @@ -423,7 +423,7 @@ func (l *linter) lint(ctx android.ModuleContext) { depSetsBuilder := NewLintDepSetBuilder().Direct(html, text, xml, baseline) - ctx.VisitDirectDepsWithTag(staticLibTag, func(dep android.Module) { + ctx.VisitDirectDepsProxyWithTag(staticLibTag, func(dep android.ModuleProxy) { if info, ok := android.OtherModuleProvider(ctx, dep, LintProvider); ok { depSetsBuilder.Transitive(info) } |