Bug 1555255 - Don't require a network connection to produce Javadoc. r=agi, a=npotb
authorNick Alexander <nalexander@mozilla.com>
Tue, 25 Jun 2019 19:58:26 +0000
changeset 537120 fa342b3889f31d94c001674aa190c8890d67582c
parent 537119 6a10f43a0e116e3fcb8bb9ec816490f365eed1ce
child 537121 69434884440fcdf4592d0b044b705ed2c229f811
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersagi, npotb
bugs1555255, 24026735
milestone68.0
Bug 1555255 - Don't require a network connection to produce Javadoc. r=agi, a=npotb 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