summaryrefslogtreecommitdiff
path: root/apex/builder.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2025-02-11 11:40:13 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-11 11:40:13 -0800
commit1dc3511441bae21a32481a22ef7ce8f61a7a2388 (patch)
tree4ef8d45c9ba3ab91eff15d5b8e4840b093dc017e /apex/builder.go
parent434953e9547aaa6d21c7a124a89f9a3695a9fc4d (diff)
parent6db3e6ffd9b89424d1c78917f80bfaf071c41902 (diff)
Merge changes from topics "apex_transition_info", "bcp_dependency_through_apex" into main am: 5c846d8349 am: 6db3e6ffd9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3470502 Change-Id: I9557fe50d5bdae792487fbc06e64c4b9473c65a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex/builder.go')
-rw-r--r--apex/builder.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/builder.go b/apex/builder.go
index 63efa6332..03a0bb902 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -1105,7 +1105,7 @@ func (a *apexBundle) buildApexDependencyInfo(ctx android.ModuleContext) {
}
depInfos := android.DepNameToDepInfoMap{}
- a.WalkPayloadDepsProxy(ctx, func(ctx android.BaseModuleContext, from, to android.ModuleProxy, externalDep bool) bool {
+ a.WalkPayloadDeps(ctx, func(ctx android.BaseModuleContext, from android.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.