diff options
| author | 2024-12-20 23:31:32 +0000 | |
|---|---|---|
| committer | 2025-01-08 23:28:12 +0000 | |
| commit | 8024b92aa2edf9a2c0dcab4dc40a081b002146da (patch) | |
| tree | f564bb72582ea466cebc57054465d820a1ac6e95 /apex/apex.go | |
| parent | 63ee59d96214105d5a0b134ab06671745c5ed8ea (diff) | |
Convert depsToPaths to use ModuleProxy for both cc and rust.
Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: Id465f293c3615fc803b34c990f19b4386ebece1c
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 773439152..58960aca6 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) { |