Merge changes from topic "verifyNativeImplementationLibs" into main
* changes:
Change verifyNativeImplementationLibs to use ModuleProxy.
Change enforcePartitionTagOnApexSystemServerJar and provideApexExportsInfo to use ModuleProxy.
diff --git a/apex/apex.go b/apex/apex.go
index e140689..f934134 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1850,7 +1850,7 @@
// 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 @@
// 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(),
@@ -2885,7 +2885,7 @@
}
var appEmbeddedJNILibs android.Paths
- ctx.VisitDirectDeps(func(dep android.Module) {
+ ctx.VisitDirectDepsProxy(func(dep android.ModuleProxy) {
tag := ctx.OtherModuleDependencyTag(dep)
if !checkApexTag(tag) {
return