Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 702fb3bd authored by Sorin Basca's avatar Sorin Basca
Browse files

Switch to use new Doclava 

Bug: 260694901
Test: m sdk
Change-Id: I0b7331eeca3d3e66a87ddd5c3ebf6b4debbafc22
parent a1e3a558

java/droiddoc.go

+6 −11
Original line number Diff line number Diff line
@@ -603,12 +603,10 @@ func (d *Droiddoc) doclavaDocsFlags(ctx android.ModuleContext, cmd *android.Rule 
		Flag("-J-XX:-OmitStackTraceInFastThrow").

		Flag("-XDignore.symbol.file").

		Flag("--ignore-source-errors").

		// b/240421555: use a stub doclet until Doclava works with JDK 17

		//FlagWithArg("-doclet ", "com.google.doclava.Doclava").

		FlagWithArg("-doclet ", "com.google.stubdoclet.StubDoclet").

		FlagWithArg("-doclet ", "com.google.doclava.Doclava").

		FlagWithInputList("-docletpath ", docletPath.Paths(), ":").

		FlagWithArg("-Xmaxerrs ", "1").

		FlagWithArg("-Xmaxwarns ", "1").

		FlagWithArg("-Xmaxerrs ", "10").

		FlagWithArg("-Xmaxwarns ", "10").

		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").

		FlagWithArg("-hdf page.build ", ctx.Config().BuildId()+"-$(cat "+buildNumberFile.String()+")").OrderOnly(buildNumberFile).
@@ -780,8 +778,6 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { 


	jsilver := ctx.Config().HostJavaToolPath(ctx, "jsilver.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")

	srcJarDir := android.PathForModuleOut(ctx, "srcjars")
@@ -809,8 +805,7 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
	if Bool(d.properties.Dokka_enabled) {

		desc = "dokka"

	} else {

		// b/240421555: use a stub doclet until Doclava works with JDK 17

		d.doclavaDocsFlags(ctx, cmd, classpath{jsilver, doclava, stubdoclet})

		d.doclavaDocsFlags(ctx, cmd, classpath{jsilver, doclava})



		for _, o := range d.Javadoc.properties.Out {

			cmd.ImplicitOutput(android.PathForModuleGen(ctx, o))
@@ -828,9 +823,9 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
		FlagWithArg("-C ", outDir.String()).

		FlagWithArg("-D ", outDir.String())



	// rule.Restat()

	rule.Restat()



	// zipSyncCleanupCmd(rule, srcJarDir)

	zipSyncCleanupCmd(rule, srcJarDir)



	rule.Build("javadoc", desc)

}