commit 663e4508dc4fe228696ede997d5fca24e4c1431e
author Yu Liu <yudiliu@google.com> Mon Aug 12 18:23:59 2024 +0000
committer Yu Liu <yudiliu@google.com> Mon Aug 12 22:50:19 2024 +0000
tree 9b7af2c4054009b226b492484224bc598f4d7ae8
parent 703c2e3d64aff7950a8485a2c46fe15b0f91d89e

Merge SingletonProviderContext with OtherModuleProviderContext

Bug: 358425833
Test: CI
Change-Id: I8e3f40dc3cfc5337008b419801f8e6bf2d48e8b2

android/makevars.go

diff --git a/android/makevars.go b/android/makevars.go
index f92f458..ff43cc5 100644
--- a/android/makevars.go
+++ b/android/makevars.go
@@ -94,7 +94,7 @@
 	ModuleDir(module blueprint.Module) string
 	ModuleSubDir(module blueprint.Module) string
 	ModuleType(module blueprint.Module) string
-	moduleProvider(module blueprint.Module, key blueprint.AnyProviderKey) (any, bool)
+	otherModuleProvider(module blueprint.Module, key blueprint.AnyProviderKey) (any, bool)
 	BlueprintFile(module blueprint.Module) string
 
 	ModuleErrorf(module blueprint.Module, format string, args ...interface{})