diff options
| author | 2024-09-26 18:29:22 +0000 | |
|---|---|---|
| committer | 2024-09-26 18:29:22 +0000 | |
| commit | 4649b1fb6542ffb51c10c5f4ba2534d19a67253a (patch) | |
| tree | 43ab66a7a61c0b4498030b0dfe3db6dc542ea113 /java | |
| parent | c980c1e4dfb7d43ded26f09831eec35f0699cb6d (diff) | |
| parent | 8bf14fcb89c300143dda1b8b5ce6ff8d28583109 (diff) | |
Merge "Allow WalkPayloadDeps to be called from mutators" into main
Diffstat (limited to 'java')
| -rw-r--r-- | java/app.go | 4 | ||||
| -rw-r--r-- | java/sdk_library.go | 2 |
2 files changed, 3 insertions, 3 deletions
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 f9388ba2a..eb9fa5f58 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1323,7 +1323,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 { |