diff options
| author | 2025-01-10 11:19:03 -0800 | |
|---|---|---|
| committer | 2025-01-10 11:19:03 -0800 | |
| commit | 6aca2bb0198b851b1a7bbbfad2f746c4b8ca82f0 (patch) | |
| tree | 85e90c0833b5fd29f011ad9ddc3a81aaa9d6f3a7 /apex/apex.go | |
| parent | 8bf5dd84f87665c85bd0db273ca8d1c434da7b0a (diff) | |
| parent | 8a8d5b4b1c714707faf2b9456099ac95fad74b7a (diff) | |
Merge changes Ie3b6d1f8,Id465f293 into main
* changes:
Convert CollectAllSharedDependencies to use ModuleProxy.
Convert depsToPaths to use ModuleProxy for both cc and rust.
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 d1d3d97d0..d39a17fe7 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2588,7 +2588,7 @@ func (a *apexBundle) checkStaticLinkingToStubLibraries(ctx android.ModuleContext }) a.WalkPayloadDepsProxy(ctx, func(ctx android.BaseModuleContext, from, to android.ModuleProxy, externalDep bool) bool { - if ccInfo, ok := android.OtherModuleProvider(ctx, to, cc.CcInfoProvider); ok { + if info, ok := android.OtherModuleProvider(ctx, to, cc.LinkableInfoProvider); ok { // If `to` is not actually in the same APEX as `from` then it does not need // apex_available and neither do any of its dependencies. if externalDep { @@ -2609,7 +2609,7 @@ func (a *apexBundle) checkStaticLinkingToStubLibraries(ctx android.ModuleContext return false } - isStubLibraryFromOtherApex := ccInfo.HasStubsVariants && !librariesDirectlyInApex[toName] + isStubLibraryFromOtherApex := info.HasStubsVariants && !librariesDirectlyInApex[toName] if isStubLibraryFromOtherApex && !externalDep { ctx.ModuleErrorf("%q required by %q is a native library providing stub. "+ "It shouldn't be included in this APEX via static linking. Dependency path: %s", to.String(), fromName, ctx.GetPathString(false)) @@ -2740,7 +2740,7 @@ func (a *apexBundle) checkStaticExecutables(ctx android.ModuleContext) { return } - if android.OtherModuleProviderOrDefault(ctx, module, cc.LinkableInfoKey).StaticExecutable { + if android.OtherModuleProviderOrDefault(ctx, module, cc.LinkableInfoProvider).StaticExecutable { apex := a.ApexVariationName() exec := ctx.OtherModuleName(module) if isStaticExecutableAllowed(apex, exec) { |