Bug 1426244 - 1. Fix some errors from javadoc generation; r=nalexander

Tweak the javadoc task arguments to not generate errors for a standard
GeckoView javadoc run.

MozReview-Commit-ID: 931xCtUcX6N

--HG--
extra : rebase_source : 51e13cd4ec4a0ad9ec91e3bf2b52768aa6ba5e16

mobile/android/geckoview/build.gradle

@@ -180,19 +180,26 @@ android.libraryVariants.all { variant ->
     def name = variant.name
     def javadoc = task "javadoc${name.capitalize()}"(type: Javadoc) {
         description = "Generate Javadoc for build variant $name"
-        failOnError = false
         destinationDir = new File(destinationDir, variant.baseName)
+        classpath = files(variant.javaCompile.classpath.files)
+
         source = files(variant.javaCompile.source)
-        classpath = files(variant.javaCompile.classpath.files) + files(android.bootClasspath)
+        exclude '**/R.java', '**/BuildConfig.java', 'com/google/**', 'org/webrtc/**'
-        options.windowTitle("Mozilla GeckoView ${mozconfig.substs.MOZ_APP_VERSION} API Reference")
+        options.addPathOption('sourcepath', ':').setValue(
-        options.docTitle("Mozilla GeckoView ${mozconfig.substs.MOZ_APP_VERSION}")
+            variant.sourceSets.collect({ it.javaDirectories }).flatten() +
-        options.header("Mozilla GeckoView ${mozconfig.substs.MOZ_APP_VERSION} API Reference")
+            variant.generateBuildConfig.sourceOutputDir)
-        options.bottom("© 2016 Mozilla. All rights reserved.")
+
-        options.links("http://docs.oracle.com/javase/7/docs/api/")
+        // javadoc 8 has a bug that requires the rt.jar file from the JRE to be
-        options.linksOffline("http://d.android.com/reference/", "$System.env.ANDROID_HOME/docs/reference")
+        // in the bootclasspath (https://stackoverflow.com/a/30458820).
-        // TODO: options.overview("src/main/java/overview.html")
+        options.bootClasspath = [
-        options.group("Mozilla GeckoView", "org.mozilla.gecko*") // TODO: narrow this down.
+            file("${System.properties['java.home']}/lib/rt.jar")] + android.bootClasspath
-        exclude '**/R.java', '**/BuildConfig.java', 'com/googlecode/**'
+        options.memberLevel = JavadocMemberLevel.PROTECTED
+        options.source = 7
+
+        options.docTitle = "GeckoView ${mozconfig.substs.MOZ_APP_VERSION} API"
+        options.header = "GeckoView ${mozconfig.substs.MOZ_APP_VERSION} API"
+        options.addStringOption('noindex');
+        options.addStringOption('noqualifier', 'java.lang');
     }
 
     task "javadocJar${name.capitalize()}"(type: Jar, dependsOn: javadoc) {