diff options
| author | 2024-09-26 18:30:59 +0000 | |
|---|---|---|
| committer | 2024-09-26 18:30:59 +0000 | |
| commit | ca7ba8764c9fec5b517ce2724f67936448819d3c (patch) | |
| tree | 43ab66a7a61c0b4498030b0dfe3db6dc542ea113 /apex/apex.go | |
| parent | ee48dd6f1e09b45f70d51e2bd88bb4b13c5eb14c (diff) | |
| parent | 4649b1fb6542ffb51c10c5f4ba2534d19a67253a (diff) | |
Merge "Allow WalkPayloadDeps to be called from mutators" into main am: 4649b1fb65
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3283078
Change-Id: I4960bf8f833bff5351022aa1d53bf47776246f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 6 |
1 files changed, 3 insertions, 3 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 |