From 7e60122dee83da5d7cd7a4f43c0e68d21cfe58f5 Mon Sep 17 00:00:00 2001 From: Yu Liu Date: Tue, 3 Dec 2024 22:24:05 +0000 Subject: Change enforcePartitionTagOnApexSystemServerJar and provideApexExportsInfo to use ModuleProxy. Bug: 377723687 Test: Unit tests and compare the ninja and mk files generated. Change-Id: If00ec9ce1a7676a98c34548e4344528dd0785692 --- apex/apex.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apex/apex.go') diff --git a/apex/apex.go b/apex/apex.go index e14068939..67c0a1990 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1850,7 +1850,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.") @@ -2309,7 +2309,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(), -- cgit v1.2.3-59-g8ed1b