Android: Use checked-in JDK for generate_javadoc.py

We no longer require devs to have JDK8 on their path.

Bug: 1036426
Change-Id: I0dd9276d5c76bee714c2cd68d24b23feb93ed43f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2020548
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Ryan Hamilton <rch@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735591}

components/cronet/tools/generate_javadoc.py

@@ -12,8 +12,6 @@ import tempfile
 
 REPOSITORY_ROOT = os.path.abspath(
     os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir))
-DOCLAVA_DIR = os.path.join(REPOSITORY_ROOT, 'buildtools', 'android', 'doclava')
-SDK_DIR = os.path.join(REPOSITORY_ROOT, 'third_party', 'android_sdk', 'public')
 
 sys.path.insert(0, os.path.join(REPOSITORY_ROOT, 'build/android/gyp'))
 sys.path.insert(0, os.path.join(REPOSITORY_ROOT, 'net/tools/net_docs'))
@@ -24,6 +22,9 @@ from markdown.postprocessors import Postprocessor
 from markdown.extensions import Extension
 # pylint: enable=wrong-import-position
 
+DOCLAVA_DIR = os.path.join(REPOSITORY_ROOT, 'buildtools', 'android', 'doclava')
+SDK_DIR = os.path.join(REPOSITORY_ROOT, 'third_party', 'android_sdk', 'public')
+JAVADOC_PATH = os.path.join(build_utils.JAVA_HOME, 'bin', 'javadoc')
 
 class CronetPostprocessor(Postprocessor):
   def run(self, text):
@@ -48,8 +49,9 @@ def GenerateJavadoc(options, src_dir, output_dir):
   build_utils.DeleteDirectory(output_dir)
   build_utils.MakeDirectory(output_dir)
   javadoc_cmd = [
-    'javadoc',
+    os.path.abspath(JAVADOC_PATH),
     '-d', output_dir,
+    '-quiet',
     '-overview', overview_file,
     '-doclet', 'com.google.doclava.Doclava',
     '-docletpath',
@@ -58,7 +60,7 @@ def GenerateJavadoc(options, src_dir, output_dir):
     '-title', 'Cronet API',
     '-federate', 'Android', 'https://developer.android.com/',
     '-federationapi', 'Android', os.path.join(DOCLAVA_DIR, 'current.txt'),
-    '-bootclasspath',
+    '-classpath',
     '%s:%s' % (os.path.abspath(android_sdk_jar),
                os.path.abspath(options.support_annotations_jar)),
   ]
@@ -67,8 +69,7 @@ def GenerateJavadoc(options, src_dir, output_dir):
       if filename.endswith(".java"):
         javadoc_cmd += [os.path.join(subdir, filename)]
   try:
-    build_utils.CheckOutput(javadoc_cmd, cwd=working_dir,
-        fail_func=lambda ret, stderr: (ret != 0 or not stderr is ''))
+    build_utils.CheckOutput(javadoc_cmd, cwd=working_dir)
   except build_utils.CalledProcessError:
     build_utils.DeleteDirectory(output_dir)
     raise