StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Switch to use new Doclava"" am: 29b20ea4a8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2458512

Change-Id: Ib992972d2c829a385833a71346e4dfb330a9bc43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sorin Basca
2023-02-27 20:54:53 +00:00
committed by Automerger Merge Worker
parent 06ee3d7444 29b20ea4a8
commit deac31ef48
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/droiddoc.go
View File

@@ -603,10 +603,12 @@ func (d *Droiddoc) doclavaDocsFlags(ctx android.ModuleContext, cmd *android.Rule
Flag("-J-XX:-OmitStackTraceInFastThrow"). Flag("-J-XX:-OmitStackTraceInFastThrow").
Flag("-XDignore.symbol.file"). Flag("-XDignore.symbol.file").
Flag("--ignore-source-errors"). Flag("--ignore-source-errors").
FlagWithArg("-doclet ", "com.google.doclava.Doclava"). // b/240421555: use a stub doclet until Doclava works with JDK 17
//FlagWithArg("-doclet ", "com.google.doclava.Doclava").
FlagWithArg("-doclet ", "com.google.stubdoclet.StubDoclet").
FlagWithInputList("-docletpath ", docletPath.Paths(), ":"). FlagWithInputList("-docletpath ", docletPath.Paths(), ":").
FlagWithArg("-Xmaxerrs ", "10"). FlagWithArg("-Xmaxerrs ", "1").
FlagWithArg("-Xmaxwarns ", "10"). FlagWithArg("-Xmaxwarns ", "1").
Flag("-J--add-exports=jdk.javadoc/jdk.javadoc.internal.doclets.formats.html=ALL-UNNAMED"). Flag("-J--add-exports=jdk.javadoc/jdk.javadoc.internal.doclets.formats.html=ALL-UNNAMED").
Flag("-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"). Flag("-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED").
FlagWithArg("-hdf page.build ", ctx.Config().BuildId()+"-$(cat "+buildNumberFile.String()+")").OrderOnly(buildNumberFile). FlagWithArg("-hdf page.build ", ctx.Config().BuildId()+"-$(cat "+buildNumberFile.String()+")").OrderOnly(buildNumberFile).
@@ -778,6 +780,8 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
jsilver := ctx.Config().HostJavaToolPath(ctx, "jsilver.jar") jsilver := ctx.Config().HostJavaToolPath(ctx, "jsilver.jar")
doclava := ctx.Config().HostJavaToolPath(ctx, "doclava.jar") doclava := ctx.Config().HostJavaToolPath(ctx, "doclava.jar")
// b/240421555: use a stub doclet until Doclava works with JDK 17
stubdoclet := ctx.Config().HostJavaToolPath(ctx, "stubdoclet.jar")
outDir := android.PathForModuleOut(ctx, "out") outDir := android.PathForModuleOut(ctx, "out")
srcJarDir := android.PathForModuleOut(ctx, "srcjars") srcJarDir := android.PathForModuleOut(ctx, "srcjars")
@@ -805,7 +809,8 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if Bool(d.properties.Dokka_enabled) { if Bool(d.properties.Dokka_enabled) {
desc = "dokka" desc = "dokka"
} else { } else {
d.doclavaDocsFlags(ctx, cmd, classpath{jsilver, doclava}) // b/240421555: use a stub doclet until Doclava works with JDK 17
d.doclavaDocsFlags(ctx, cmd, classpath{jsilver, doclava, stubdoclet})
for _, o := range d.Javadoc.properties.Out { for _, o := range d.Javadoc.properties.Out {
cmd.ImplicitOutput(android.PathForModuleGen(ctx, o)) cmd.ImplicitOutput(android.PathForModuleGen(ctx, o))
@@ -823,9 +828,9 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
FlagWithArg("-C ", outDir.String()). FlagWithArg("-C ", outDir.String()).
FlagWithArg("-D ", outDir.String()) FlagWithArg("-D ", outDir.String())
rule.Restat() // rule.Restat()
zipSyncCleanupCmd(rule, srcJarDir) // zipSyncCleanupCmd(rule, srcJarDir)
rule.Build("javadoc", desc) rule.Build("javadoc", desc)
} }