diff options
| author | 2024-09-26 18:29:22 +0000 | |
|---|---|---|
| committer | 2024-09-26 18:29:22 +0000 | |
| commit | 4649b1fb6542ffb51c10c5f4ba2534d19a67253a (patch) | |
| tree | 43ab66a7a61c0b4498030b0dfe3db6dc542ea113 /apex | |
| parent | c980c1e4dfb7d43ded26f09831eec35f0699cb6d (diff) | |
| parent | 8bf14fcb89c300143dda1b8b5ce6ff8d28583109 (diff) | |
Merge "Allow WalkPayloadDeps to be called from mutators" into main
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/apex.go | 6 | ||||
| -rw-r--r-- | apex/builder.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apex/apex.go b/apex/apex.go index 902059543..ded21753c 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1809,7 +1809,7 @@ func apexFileForFilesystem(ctx android.BaseModuleContext, buildFile android.Path // visited module, the `do` callback is executed. Returning true in the callback continues the visit // to the child modules. Returning false makes the visit to continue in the sibling or the parent // modules. This is used in check* functions below. -func (a *apexBundle) WalkPayloadDeps(ctx android.ModuleContext, do android.PayloadDepsCallback) { +func (a *apexBundle) WalkPayloadDeps(ctx android.BaseModuleContext, do android.PayloadDepsCallback) { ctx.WalkDeps(func(child, parent android.Module) bool { am, ok := child.(android.ApexModule) if !ok || !am.CanHaveApexVariants() { @@ -2655,7 +2655,7 @@ func (a *apexBundle) checkStaticLinkingToStubLibraries(ctx android.ModuleContext abInfo, _ := android.ModuleProvider(ctx, android.ApexBundleInfoProvider) - 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 { if ccm, ok := to.(*cc.Module); ok { apexName := ctx.ModuleName() fromName := ctx.OtherModuleName(from) @@ -2767,7 +2767,7 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) { return } - 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 { // As soon as the dependency graph crosses the APEX boundary, don't go further. if externalDep { return false diff --git a/apex/builder.go b/apex/builder.go index 7334aca92..244119bdd 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -1092,7 +1092,7 @@ func (a *apexBundle) buildApexDependencyInfo(ctx android.ModuleContext) { } depInfos := 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 { if from.Name() == to.Name() { // This can happen for cc.reuseObjTag. We are not interested in tracking this. // As soon as the dependency graph crosses the APEX boundary, don't go further. |