commit 39f5fb3db37a307081cd96d334feb6a7fcc7a7d7
author Yu Liu <yudiliu@google.com> Mon Jan 13 23:52:19 2025 +0000
committer Yu Liu <yudiliu@google.com> Wed Jan 15 20:52:06 2025 +0000
tree d32d73a9069d72578b16b963e1e6996cdd3f92de
parent f6f8549664d1ab0ab944713cd96f27c2ed934582

Convert collectDeps and collectTransitiveHeaderJarsForR8 to use ModuleProxy.

Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: I957c09bba8fc047cb8959461294d8879486185a6

java/aar.go

diff --git a/java/aar.go b/java/aar.go
index 0db195c..b982b95 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -1455,7 +1455,7 @@
 	var transitiveStaticLibsImplementationJars []depset.DepSet[android.Path]
 	var transitiveStaticLibsResourceJars []depset.DepSet[android.Path]
 
-	ctx.VisitDirectDeps(func(module android.Module) {
+	ctx.VisitDirectDepsProxy(func(module android.ModuleProxy) {
 		if dep, ok := android.OtherModuleProvider(ctx, module, JavaInfoProvider); ok {
 			tag := ctx.OtherModuleDependencyTag(module)
 			switch tag {