summaryrefslogtreecommitdiff
path: root/java/droiddoc.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2022-09-14 12:45:42 -0700
committer Colin Cross <ccross@android.com> 2022-09-14 12:48:17 -0700
commitbc2c8a7517f0265618eda4c780df7fc529e09315 (patch)
treeeb9351007a299998c1777b0f1c354d2d6516605b /java/droiddoc.go
parenta73e67250365cbcd6af5b3a37e94ce144bc18297 (diff)
Move AllowMissingDependencies handling into processMainCert
I046d75dbbd4f21f4a2b6851f558e430e9879fcff fixed android_app modules with missing certificate dependencies when AllowMissingDependencies was set, but the same problem can occur in android_app_import and android_rro modules. Move the AllowMissingDependencies handling into processMainCert so that it applies to all of them. Bug: 246649647 Test: TestAppImportMissingCertificateAllowMissingDependencies Change-Id: Ic7dd3e61e0e3af15c53b583cf680b1e52394a018
Diffstat (limited to 'java/droiddoc.go')
-rw-r--r--java/droiddoc.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go
index 9b1f43b4c..414380a67 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -684,7 +684,7 @@ func javadocCmd(ctx android.ModuleContext, rule *android.RuleBuilder, srcs andro
outDir, srcJarDir, srcJarList android.Path, sourcepaths android.Paths) *android.RuleBuilderCommand {
cmd := rule.Command().
- BuiltTool("soong_javac_wrapper").Tool(config.JavadocCmd(ctx)).
+ BuiltTool("soong_javac_wrapper").Tool(android.PathForSource(ctx, "prebuilts/jdk/jdk11/linux-x86/bin/javadoc")).
Flag(config.JavacVmFlags).
FlagWithArg("-encoding ", "UTF-8").
FlagWithRspFileInputList("@", android.PathForModuleOut(ctx, "javadoc.rsp"), srcs).