summaryrefslogtreecommitdiff
path: root/java/sdk.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2023-12-18 22:43:45 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-12-18 22:43:45 +0000
commit51428c451a73d9d246ccecd045b0b8c76a417df1 (patch)
tree5113d87ec33b1e96150a9ad5df463e579facdb18 /java/sdk.go
parent8070c4b457d890455bd7c8437ab84d02d9e7f3bc (diff)
parent5a37718c956b1bfbda5e236c0fe50f08661a81de (diff)
Merge changes I6f116385,Id77f514d,I73479de1,If58f4b53 into main
* changes: Convert ModuleProvder to generic providers API Convert OtherModuleProvider to generic providers API Convert Provider to generic providers API Convert SetProvider to generic providers API
Diffstat (limited to 'java/sdk.go')
-rw-r--r--java/sdk.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/java/sdk.go b/java/sdk.go
index ad71fb236..352b24319 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -262,8 +262,7 @@ func createFrameworkAidl(stubsModules []string, path android.WritablePath, ctx a
ctx.VisitAllModules(func(module android.Module) {
// Collect dex jar paths for the modules listed above.
- if ctx.ModuleHasProvider(module, JavaInfoProvider) {
- j := ctx.ModuleProvider(module, JavaInfoProvider).(JavaInfo)
+ if j, ok := android.SingletonModuleProvider(ctx, module, JavaInfoProvider); ok {
name := ctx.ModuleName(module)
if i := android.IndexList(name, stubsModules); i != -1 {
stubsJars[i] = j.HeaderJars