summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Yu Liu <yudiliu@google.com> 2025-01-13 23:52:19 +0000
committer Yu Liu <yudiliu@google.com> 2025-01-15 20:52:06 +0000
commit39f5fb3db37a307081cd96d334feb6a7fcc7a7d7 (patch)
treed32d73a9069d72578b16b963e1e6996cdd3f92de /java/java.go
parentf6f8549664d1ab0ab944713cd96f27c2ed934582 (diff)
Convert collectDeps and collectTransitiveHeaderJarsForR8 to use ModuleProxy.
Bug: 377723687 Test: Unit tests and compare the ninja and mk files generated. Change-Id: I957c09bba8fc047cb8959461294d8879486185a6
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/java/java.go b/java/java.go
index 3a1bc335a..0a9381dad 100644
--- a/java/java.go
+++ b/java/java.go
@@ -640,11 +640,11 @@ type deps struct {
transitiveStaticLibsResourceJars []depset.DepSet[android.Path]
}
-func checkProducesJars(ctx android.ModuleContext, dep android.SourceFileProducer) {
- for _, f := range dep.Srcs() {
+func checkProducesJars(ctx android.ModuleContext, dep android.SourceFilesInfo, module android.ModuleProxy) {
+ for _, f := range dep.Srcs {
if f.Ext() != ".jar" {
ctx.ModuleErrorf("genrule %q must generate files ending with .jar to be used as a libs or static_libs dependency",
- ctx.OtherModuleName(dep.(blueprint.Module)))
+ ctx.OtherModuleName(module))
}
}
}
@@ -2761,7 +2761,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) {
var staticJars android.Paths
var staticResourceJars android.Paths
var staticHeaderJars android.Paths
- ctx.VisitDirectDeps(func(module android.Module) {
+ ctx.VisitDirectDepsProxy(func(module android.ModuleProxy) {
tag := ctx.OtherModuleDependencyTag(module)
if dep, ok := android.OtherModuleProvider(ctx, module, JavaInfoProvider); ok {
switch tag {
@@ -3395,7 +3395,7 @@ var String = proptools.String
var inList = android.InList[string]
// Add class loader context (CLC) of a given dependency to the current CLC.
-func addCLCFromDep(ctx android.ModuleContext, depModule android.Module,
+func addCLCFromDep(ctx android.ModuleContext, depModule android.ModuleProxy,
clcMap dexpreopt.ClassLoaderContextMap) {
dep, ok := android.OtherModuleProvider(ctx, depModule, JavaInfoProvider)
@@ -3455,7 +3455,7 @@ func addCLCFromDep(ctx android.ModuleContext, depModule android.Module,
}
}
-func addMissingOptionalUsesLibsFromDep(ctx android.ModuleContext, depModule android.Module,
+func addMissingOptionalUsesLibsFromDep(ctx android.ModuleContext, depModule android.ModuleProxy,
usesLibrary *usesLibrary) {
dep, ok := android.OtherModuleProvider(ctx, depModule, JavaInfoProvider)