Merge SingletonProviderContext with OtherModuleProviderContext

Bug: 358425833 Test: CI Change-Id: I8e3f40dc3cfc5337008b419801f8e6bf2d48e8b2
2024-08-12 18:23:59 +00:00
parent 703c2e3d64
commit 663e4508dc
38 changed files with 74 additions and 89 deletions
--- a/android/all_teams.go
+++ b/android/all_teams.go
@@ -1,9 +1,10 @@
 package android

 import (
-	"android/soong/android/team_proto"
 	"path/filepath"

+	"android/soong/android/team_proto"
+
 	"google.golang.org/protobuf/proto"
 )

@@ -93,7 +94,7 @@ func (t *allTeamsSingleton) GenerateBuildActions(ctx SingletonContext) {
 		}

 		testModInfo := TestModuleInformation{}
-		if tmi, ok := SingletonModuleProvider(ctx, module, TestOnlyProviderKey); ok {
+		if tmi, ok := OtherModuleProvider(ctx, module, TestOnlyProviderKey); ok {
 			testModInfo = tmi
 		}