From 871427c9e4eac009465596eb79e7b0dc5cbfdbb0 Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Tue, 25 Jun 2019 19:58:26 +0000 Subject: [PATCH] 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 --HG-- extra : moz-landing-system : lando --- mobile/android/geckoview/build.gradle | 4 +++- python/mozboot/mozboot/android-packages.txt | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mobile/android/geckoview/build.gradle b/mobile/android/geckoview/build.gradle index c89e34389a14..d253da29c09d 100644 --- a/mobile/android/geckoview/build.gradle +++ b/mobile/android/geckoview/build.gradle @@ -273,7 +273,9 @@ android.libraryVariants.all { variant -> 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" diff --git a/python/mozboot/mozboot/android-packages.txt b/python/mozboot/mozboot/android-packages.txt index d5ce34ce7dd7..ac947a72f410 100644 --- a/python/mozboot/mozboot/android-packages.txt +++ b/python/mozboot/mozboot/android-packages.txt @@ -2,3 +2,4 @@ platform-tools build-tools;27.0.3 platforms;android-28 emulator +docs