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

Use SoongJavacWrapper for javadoc

Browse Source 
Test: m -j docs; javac_wrapper_test
Bug: b/116874473
Change-Id: I51d440c815d3db1a0a5dc26ad4e376189dc0aefe
This commit is contained in:
Nan Zhang
2018-10-02 16:11:17 -07:00
parent 946492f005
commit 40b41b4038
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/javac_wrapper/javac_wrapper.go
View File

@@ -176,4 +176,12 @@ var filters = []*regexp.Regexp{
regexp.MustCompile(`Note: (Some input files|.*\.java) uses? unchecked or unsafe operations.`), regexp.MustCompile(`Note: (Some input files|.*\.java) uses? unchecked or unsafe operations.`),
regexp.MustCompile(`Note: Recompile with -Xlint:unchecked for details.`), regexp.MustCompile(`Note: Recompile with -Xlint:unchecked for details.`),
regexp.MustCompile(`bootstrap class path not set in conjunction with -source`), regexp.MustCompile(`bootstrap class path not set in conjunction with -source`),
regexp.MustCompile(`javadoc: warning - The old Doclet and Taglet APIs in the packages`),
regexp.MustCompile(`com.sun.javadoc, com.sun.tools.doclets and their implementations`),
regexp.MustCompile(`are planned to be removed in a future JDK release. These`),
regexp.MustCompile(`components have been superseded by the new APIs in jdk.javadoc.doclet.`),
regexp.MustCompile(`Users are strongly recommended to migrate to the new APIs.`),
regexp.MustCompile(`javadoc: option --boot-class-path not allowed with target 1.9`),
} }

11
cmd/javac_wrapper/javac_wrapper_test.go
View File

@@ -64,6 +64,17 @@ warning: [options] bootstrap class path not set in conjunction with -source 1.7
in: "\n", in: "\n",
out: "\n", out: "\n",
}, },
{
in: `
javadoc: warning - The old Doclet and Taglet APIs in the packages
com.sun.javadoc, com.sun.tools.doclets and their implementations
are planned to be removed in a future JDK release. These
components have been superseded by the new APIs in jdk.javadoc.doclet.
Users are strongly recommended to migrate to the new APIs.
javadoc: option --boot-class-path not allowed with target 1.9
`,
out: "\n",
},
} }
func TestJavacColorize(t *testing.T) { func TestJavacColorize(t *testing.T) {

9
java/droiddoc.go
View File

@@ -30,7 +30,7 @@ var (
blueprint.RuleParams{ blueprint.RuleParams{
Command: `rm -rf "$outDir" "$srcJarDir" "$stubsDir" && mkdir -p "$outDir" "$srcJarDir" "$stubsDir" && ` + Command: `rm -rf "$outDir" "$srcJarDir" "$stubsDir" && mkdir -p "$outDir" "$srcJarDir" "$stubsDir" && ` +
`${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` +
`${config.JavadocCmd} -encoding UTF-8 @$out.rsp @$srcJarDir/list ` + `${config.SoongJavacWrapper} ${config.JavadocCmd} -encoding UTF-8 @$out.rsp @$srcJarDir/list ` +
`$opts $bootclasspathArgs $classpathArgs $sourcepathArgs ` + `$opts $bootclasspathArgs $classpathArgs $sourcepathArgs ` +
`-d $outDir -quiet && ` + `-d $outDir -quiet && ` +
`${config.SoongZipCmd} -write_if_changed -d -o $docZip -C $outDir -D $outDir && ` + `${config.SoongZipCmd} -write_if_changed -d -o $docZip -C $outDir -D $outDir && ` +
@@ -40,9 +40,10 @@ var (
"${config.JavadocCmd}", "${config.JavadocCmd}",
"${config.SoongZipCmd}", "${config.SoongZipCmd}",
}, },
Rspfile: "$out.rsp", CommandOrderOnly: []string{"${config.SoongJavacWrapper}"},
RspfileContent: "$in", Rspfile: "$out.rsp",
Restat: true, RspfileContent: "$in",
Restat: true,
}, },
"outDir", "srcJarDir", "stubsDir", "srcJars", "opts", "outDir", "srcJarDir", "stubsDir", "srcJars", "opts",
"bootclasspathArgs", "classpathArgs", "sourcepathArgs", "docZip", "postDoclavaCmds") "bootclasspathArgs", "classpathArgs", "sourcepathArgs", "docZip", "postDoclavaCmds")