diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-10-02 16:11:17 -0700 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-10-02 16:45:37 -0700 |
| commit | 40b41b4038b24481cab26129ab137e24aba81caf (patch) | |
| tree | 7f0cde46098b35a3eac3f9c4d8ef0a380516c485 /cmd | |
| parent | 946492f005c89ae49ead9869ff12689d2b675143 (diff) | |
| download | build_soong-40b41b4038b24481cab26129ab137e24aba81caf.tar.gz build_soong-40b41b4038b24481cab26129ab137e24aba81caf.tar.bz2 build_soong-40b41b4038b24481cab26129ab137e24aba81caf.zip | |
Use SoongJavacWrapper for javadoc
Test: m -j docs; javac_wrapper_test
Bug: b/116874473
Change-Id: I51d440c815d3db1a0a5dc26ad4e376189dc0aefe
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/javac_wrapper/javac_wrapper.go | 8 | ||||
| -rw-r--r-- | cmd/javac_wrapper/javac_wrapper_test.go | 11 |
2 files changed, 19 insertions, 0 deletions
diff --git a/cmd/javac_wrapper/javac_wrapper.go b/cmd/javac_wrapper/javac_wrapper.go index 4df49380..7a448ba3 100644 --- a/cmd/javac_wrapper/javac_wrapper.go +++ b/cmd/javac_wrapper/javac_wrapper.go @@ -176,4 +176,12 @@ var filters = []*regexp.Regexp{ regexp.MustCompile(`Note: (Some input files|.*\.java) uses? unchecked or unsafe operations.`), regexp.MustCompile(`Note: Recompile with -Xlint:unchecked for details.`), 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`), } diff --git a/cmd/javac_wrapper/javac_wrapper_test.go b/cmd/javac_wrapper/javac_wrapper_test.go index d76793fd..ad657e7d 100644 --- a/cmd/javac_wrapper/javac_wrapper_test.go +++ b/cmd/javac_wrapper/javac_wrapper_test.go @@ -64,6 +64,17 @@ warning: [options] bootstrap class path not set in conjunction with -source 1.7 in: "\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) { |