diff options
| author | 2024-08-12 18:23:59 +0000 | |
|---|---|---|
| committer | 2024-08-12 22:50:19 +0000 | |
| commit | 663e4508dc4fe228696ede997d5fca24e4c1431e (patch) | |
| tree | 9b7af2c4054009b226b492484224bc598f4d7ae8 /apex/apex_singleton.go | |
| parent | 703c2e3d64aff7950a8485a2c46fe15b0f91d89e (diff) | |
Merge SingletonProviderContext with OtherModuleProviderContext
Bug: 358425833
Test: CI
Change-Id: I8e3f40dc3cfc5337008b419801f8e6bf2d48e8b2
Diffstat (limited to 'apex/apex_singleton.go')
| -rw-r--r-- | apex/apex_singleton.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apex/apex_singleton.go b/apex/apex_singleton.go index a8d89b11e..f405cb2fe 100644 --- a/apex/apex_singleton.go +++ b/apex/apex_singleton.go @@ -88,7 +88,7 @@ func (s *apexDepsInfoSingleton) GenerateBuildActions(ctx android.SingletonContex updatableFlatLists := android.Paths{} ctx.VisitAllModules(func(module android.Module) { if binaryInfo, ok := module.(android.ApexBundleDepsInfoIntf); ok { - apexInfo, _ := android.SingletonModuleProvider(ctx, module, android.ApexInfoProvider) + apexInfo, _ := android.OtherModuleProvider(ctx, module, android.ApexInfoProvider) if path := binaryInfo.FlatListPath(); path != nil { if binaryInfo.Updatable() || apexInfo.Updatable { updatableFlatLists = append(updatableFlatLists, path) @@ -155,7 +155,7 @@ func (a *apexPrebuiltInfo) GenerateBuildActions(ctx android.SingletonContext) { prebuiltInfos := []android.PrebuiltInfo{} ctx.VisitAllModules(func(m android.Module) { - prebuiltInfo, exists := android.SingletonModuleProvider(ctx, m, android.PrebuiltInfoProvider) + prebuiltInfo, exists := android.OtherModuleProvider(ctx, m, android.PrebuiltInfoProvider) // Use prebuiltInfoProvider to filter out non apex soong modules. // Use HideFromMake to filter out the unselected variants of a specific apex. if exists && !m.IsHideFromMake() { |