diff options
| author | 2024-12-04 00:50:07 +0000 | |
|---|---|---|
| committer | 2024-12-04 00:50:07 +0000 | |
| commit | 198be083408a1203011de7d8d858131bca54db7c (patch) | |
| tree | 126a2ef71430b186c2e14a8736bea083b707a934 /apex/apex.go | |
| parent | c969f7d8261e7c5f8d2bfa3dbfd5987e8805d318 (diff) | |
| parent | 9585f8e8499013970006b3d641f7a1adfff93494 (diff) | |
Merge changes from topic "verifyNativeImplementationLibs" into main am: 9585f8e849
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3390959
Change-Id: I12facdeaa707fe78d9cea7e18371b0603cb4df15
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 ff4a43396..b4c583ff4 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1838,7 +1838,7 @@ func (vctx *visitorContext) normalizeFileInfo(mctx android.ModuleContext) { // as the apex. func (a *apexBundle) enforcePartitionTagOnApexSystemServerJar(ctx android.ModuleContext) { global := dexpreopt.GetGlobalConfig(ctx) - ctx.VisitDirectDepsWithTag(sscpfTag, func(child android.Module) { + ctx.VisitDirectDepsProxyWithTag(sscpfTag, func(child android.ModuleProxy) { info, ok := android.OtherModuleProvider(ctx, child, java.LibraryNameToPartitionInfoProvider) if !ok { ctx.ModuleErrorf("Could not find partition info of apex system server jars.") @@ -2297,7 +2297,7 @@ func (a *apexBundle) providePrebuiltInfo(ctx android.ModuleContext) { // Apexes built from source retrieve this information by visiting `bootclasspath_fragments` // Used by dex_bootjars to generate the boot image func (a *apexBundle) provideApexExportsInfo(ctx android.ModuleContext) { - ctx.VisitDirectDepsWithTag(bcpfTag, func(child android.Module) { + ctx.VisitDirectDepsProxyWithTag(bcpfTag, func(child android.ModuleProxy) { if info, ok := android.OtherModuleProvider(ctx, child, java.BootclasspathFragmentApexContentInfoProvider); ok { exports := android.ApexExportsInfo{ ApexName: a.ApexVariationName(), @@ -2873,7 +2873,7 @@ func (a *apexBundle) verifyNativeImplementationLibs(ctx android.ModuleContext) { } var appEmbeddedJNILibs android.Paths - ctx.VisitDirectDeps(func(dep android.Module) { + ctx.VisitDirectDepsProxy(func(dep android.ModuleProxy) { tag := ctx.OtherModuleDependencyTag(dep) if !checkApexTag(tag) { return |