Bug 1555255 - Don't require a network connection to produce Javadoc. r=geckoview-reviewers,agi
authorNick Alexander <nalexander@mozilla.com>
Tue, 25 Jun 2019 19:58:26 +0000
changeset 542924 44a166a4efdbfd3270f1e91c854f0dba4e62ddfb
parent 542923 cac1aaff7d7b51da082004488956610f881629e5
child 542925 caacd1cb3ec10b6d39a4fbdc5eb09a7a703d87c3
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgeckoview-reviewers, agi
bugs1555255, 24026735
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1555255 - Don't require a network connection to produce Javadoc. r=geckoview-reviewers,agi See https://stackoverflow.com/a/24026735. Adding the `docs` package requirement is not ideal, but it's not worth the effort to install it only in automation (or in the relevant task), and it's not *that* large: 1.0G on my macOS installation. Differential Revision: https://phabricator.services.mozilla.com/D35834
mobile/android/geckoview/build.gradle
python/mozboot/mozboot/android-packages.txt
--- a/mobile/android/geckoview/build.gradle
+++ b/mobile/android/geckoview/build.gradle
@@ -268,17 +268,19 @@ android.libraryVariants.all { variant ->
             variant.aidlCompile.sourceOutputDir)
 
         // javadoc 8 has a bug that requires the rt.jar file from the JRE to be
         // in the bootclasspath (https://stackoverflow.com/a/30458820).
         options.bootClasspath = [
             file("${System.properties['java.home']}/lib/rt.jar")] + android.bootClasspath
         options.memberLevel = JavadocMemberLevel.PROTECTED
         options.source = 8
-        options.links("https://d.android.com/reference/")
+        // Bug 1555255: don't require a network connection to produce Javadoc.
+        // See https://stackoverflow.com/a/24026735.
+        options.linksOffline("https://d.android.com/reference/", "${android.sdkDirectory}/docs/reference");
 
         options.docTitle = "GeckoView ${mozconfig.substs.MOZ_APP_VERSION} API"
         options.header = "GeckoView ${mozconfig.substs.MOZ_APP_VERSION} API"
         options.noTimestamp = true
         options.noIndex = true
         options.noQualifiers = ['java.lang']
         options.tags = ['hide:a:']
     }
--- a/python/mozboot/mozboot/android-packages.txt
+++ b/python/mozboot/mozboot/android-packages.txt
@@ -1,4 +1,5 @@
 platform-tools
 build-tools;27.0.3
 platforms;android-28
 emulator
+docs