From 8bf14fcb89c300143dda1b8b5ce6ff8d28583109 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 25 Sep 2024 16:41:31 -0700 Subject: Allow WalkPayloadDeps to be called from mutators Replace ModuleContext with BaseModuleContext in WalkPayloadDeps and all of the callbacks used with it to allow using WalkPayloadDeps from mutators. Test: builds Flag: EXEMPT refactor Change-Id: Ie9d6cb7e9977b1d963cfbb3e43d6749307b4b1e0 --- java/app.go | 4 ++-- java/sdk_library.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'java') diff --git a/java/app.go b/java/app.go index 4ac42a750..659a3a4ce 100644 --- a/java/app.go +++ b/java/app.go @@ -1135,7 +1135,7 @@ func collectJniDeps(ctx android.ModuleContext, return jniLibs, prebuiltJniPackages } -func (a *AndroidApp) WalkPayloadDeps(ctx android.ModuleContext, do android.PayloadDepsCallback) { +func (a *AndroidApp) WalkPayloadDeps(ctx android.BaseModuleContext, do android.PayloadDepsCallback) { ctx.WalkDeps(func(child, parent android.Module) bool { isExternal := !a.DepIsInSameApex(ctx, child) if am, ok := child.(android.ApexModule); ok { @@ -1153,7 +1153,7 @@ func (a *AndroidApp) buildAppDependencyInfo(ctx android.ModuleContext) { } depsInfo := android.DepNameToDepInfoMap{} - a.WalkPayloadDeps(ctx, func(ctx android.ModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool { + a.WalkPayloadDeps(ctx, func(ctx android.BaseModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool { depName := to.Name() // Skip dependencies that are only available to APEXes; they are developed with updatability diff --git a/java/sdk_library.go b/java/sdk_library.go index 5deb49fe7..9cd07d0a8 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1376,7 +1376,7 @@ func (module *SdkLibrary) CheckMinSdkVersion(ctx android.ModuleContext) { } func CheckMinSdkVersion(ctx android.ModuleContext, module *Library) { - android.CheckMinSdkVersion(ctx, module.MinSdkVersion(ctx), func(c android.ModuleContext, do android.PayloadDepsCallback) { + android.CheckMinSdkVersion(ctx, module.MinSdkVersion(ctx), func(c android.BaseModuleContext, do android.PayloadDepsCallback) { ctx.WalkDeps(func(child android.Module, parent android.Module) bool { isExternal := !module.depIsInSameApex(ctx, child) if am, ok := child.(android.ApexModule); ok { -- cgit v1.2.3-59-g8ed1b