diff --git a/java/droiddoc.go b/java/droiddoc.go
index dcbe48d..49674b9 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -381,7 +381,7 @@
 				deps.classpath = append(deps.classpath, dep.HeaderJars...)
 				deps.aidlIncludeDirs = append(deps.aidlIncludeDirs, dep.AidlIncludeDirs...)
 				deps.aconfigProtoFiles = append(deps.aconfigProtoFiles, dep.AconfigIntermediateCacheOutputPaths...)
-			} else if dep, ok := android.OtherModuleProvider(ctx, module, android.SourceFilesInfoKey); ok {
+			} else if dep, ok := android.OtherModuleProvider(ctx, module, android.SourceFilesInfoProvider); ok {
 				checkProducesJars(ctx, dep, module)
 				deps.classpath = append(deps.classpath, dep.Srcs...)
 			} else {
