diff options
| author | 2023-12-18 19:15:39 +0000 | |
|---|---|---|
| committer | 2023-12-18 19:15:39 +0000 | |
| commit | b2c65a26d62ee4c38dd729b8e9f4b7e37c1708d6 (patch) | |
| tree | b4293c4767a519f52bdaa1c383e5d3c49f068248 /java/classpath_element.go | |
| parent | cd11c9535fe7e09fb0ca385cfeb39880e4906980 (diff) | |
| parent | bc7d76cca2a9eead34b45bcdf333eecdb4152879 (diff) | |
Merge changes from topic "provider_generics" into main
* changes:
Convert NewProvider/NewMutatorProvider to generic providers API
Use generics for providers API
Fix TestAarImportProducesJniPackages/aar-no-jni
Diffstat (limited to 'java/classpath_element.go')
| -rw-r--r-- | java/classpath_element.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/classpath_element.go b/java/classpath_element.go index 496291678..af99fb4fb 100644 --- a/java/classpath_element.go +++ b/java/classpath_element.go @@ -72,8 +72,8 @@ var _ ClasspathElement = (*ClasspathLibraryElement)(nil) // ClasspathElementContext defines the context methods needed by CreateClasspathElements type ClasspathElementContext interface { - OtherModuleHasProvider(m blueprint.Module, provider blueprint.ProviderKey) bool - OtherModuleProvider(m blueprint.Module, provider blueprint.ProviderKey) interface{} + OtherModuleHasProvider(m blueprint.Module, provider blueprint.AnyProviderKey) bool + OtherModuleProvider(m blueprint.Module, provider blueprint.AnyProviderKey) interface{} ModuleErrorf(fmt string, args ...interface{}) } |