diff --git a/engine/src/flutter/shell/platform/android/BUILD.gn b/engine/src/flutter/shell/platform/android/BUILD.gn
index cb8e78de53..46b6d148a1 100644
--- a/engine/src/flutter/shell/platform/android/BUILD.gn
+++ b/engine/src/flutter/shell/platform/android/BUILD.gn
@@ -544,7 +544,7 @@ zip_bundle("flutter_jar_zip") {
 }
 
 action("gen_android_javadoc") {
-  script = "//flutter/tools/gen_javadoc.py"
+  script = "//flutter/tools/javadoc/gen_javadoc.py"
   sources = android_java_sources + embedding_dependencies_jars
 
   outputs = [ "$target_gen_dir/javadocs" ]
diff --git a/engine/src/flutter/tools/javadoc/android_reference/package-list b/engine/src/flutter/tools/javadoc/android_reference/package-list
new file mode 100644
index 0000000000..319c00a191
--- /dev/null
+++ b/engine/src/flutter/tools/javadoc/android_reference/package-list
@@ -0,0 +1,238 @@
+android
+android.accessibilityservice
+android.accounts
+android.animation
+android.annotation
+android.app
+android.app.admin
+android.app.appsearch
+android.app.appsearch.exceptions
+android.app.assist
+android.app.backup
+android.app.blob
+android.app.job
+android.app.people
+android.app.role
+android.app.slice
+android.app.usage
+android.appwidget
+android.bluetooth
+android.bluetooth.le
+android.companion
+android.content
+android.content.pm
+android.content.pm.verify.domain
+android.content.res
+android.content.res.loader
+android.database
+android.database.sqlite
+android.drm
+android.gesture
+android.graphics
+android.graphics.drawable
+android.graphics.drawable.shapes
+android.graphics.fonts
+android.graphics.pdf
+android.graphics.text
+android.hardware
+android.hardware.biometrics
+android.hardware.camera2
+android.hardware.camera2.params
+android.hardware.display
+android.hardware.fingerprint
+android.hardware.input
+android.hardware.lights
+android.hardware.usb
+android.icu.lang
+android.icu.math
+android.icu.number
+android.icu.text
+android.icu.util
+android.inputmethodservice
+android.location
+android.location.provider
+android.media
+android.media.audiofx
+android.media.browse
+android.media.effect
+android.media.metrics
+android.media.midi
+android.media.projection
+android.media.session
+android.media.tv
+android.mtp
+android.net
+android.net.eap
+android.net.http
+android.net.ipsec.ike
+android.net.ipsec.ike.exceptions
+android.net.nsd
+android.net.rtp
+android.net.sip
+android.net.ssl
+android.net.vcn
+android.net.wifi
+android.net.wifi.aware
+android.net.wifi.hotspot2
+android.net.wifi.hotspot2.omadm
+android.net.wifi.hotspot2.pps
+android.net.wifi.p2p
+android.net.wifi.p2p.nsd
+android.net.wifi.rtt
+android.nfc
+android.nfc.cardemulation
+android.nfc.tech
+android.opengl
+android.os
+android.os.health
+android.os.storage
+android.os.strictmode
+android.preference
+android.print
+android.print.pdf
+android.printservice
+android.provider
+android.renderscript
+android.sax
+android.se.omapi
+android.security
+android.security.identity
+android.security.keystore
+android.service.autofill
+android.service.carrier
+android.service.chooser
+android.service.controls
+android.service.controls.actions
+android.service.controls.templates
+android.service.dreams
+android.service.media
+android.service.notification
+android.service.quickaccesswallet
+android.service.quicksettings
+android.service.restrictions
+android.service.textservice
+android.service.voice
+android.service.vr
+android.service.wallpaper
+android.speech
+android.speech.tts
+android.system
+android.telecom
+android.telephony
+android.telephony.cdma
+android.telephony.data
+android.telephony.emergency
+android.telephony.euicc
+android.telephony.gsm
+android.telephony.ims
+android.telephony.ims.feature
+android.telephony.mbms
+android.test
+android.test.mock
+android.test.suitebuilder
+android.test.suitebuilder.annotation
+android.text
+android.text.format
+android.text.method
+android.text.style
+android.text.util
+android.transition
+android.util
+android.util.proto
+android.view
+android.view.accessibility
+android.view.animation
+android.view.autofill
+android.view.contentcapture
+android.view.displayhash
+android.view.inputmethod
+android.view.inspector
+android.view.textclassifier
+android.view.textservice
+android.view.translation
+android.webkit
+android.widget
+android.widget.inline
+android.window
+dalvik.annotation
+dalvik.bytecode
+dalvik.system
+java.awt.font
+java.beans
+java.io
+java.lang
+java.lang.annotation
+java.lang.invoke
+java.lang.ref
+java.lang.reflect
+java.math
+java.net
+java.nio
+java.nio.channels
+java.nio.channels.spi
+java.nio.charset
+java.nio.charset.spi
+java.nio.file
+java.nio.file.attribute
+java.nio.file.spi
+java.security
+java.security.acl
+java.security.cert
+java.security.interfaces
+java.security.spec
+java.sql
+java.text
+java.time
+java.time.chrono
+java.time.format
+java.time.temporal
+java.time.zone
+java.util
+java.util.concurrent
+java.util.concurrent.atomic
+java.util.concurrent.locks
+java.util.function
+java.util.jar
+java.util.logging
+java.util.prefs
+java.util.regex
+java.util.stream
+java.util.zip
+javax.crypto
+javax.crypto.interfaces
+javax.crypto.spec
+javax.microedition.khronos.egl
+javax.microedition.khronos.opengles
+javax.net
+javax.net.ssl
+javax.security.auth
+javax.security.auth.callback
+javax.security.auth.login
+javax.security.auth.x500
+javax.security.cert
+javax.sql
+javax.xml
+javax.xml.datatype
+javax.xml.namespace
+javax.xml.parsers
+javax.xml.transform
+javax.xml.transform.dom
+javax.xml.transform.sax
+javax.xml.transform.stream
+javax.xml.validation
+javax.xml.xpath
+junit.framework
+junit.runner
+org.apache.http.conn
+org.apache.http.conn.scheme
+org.apache.http.conn.ssl
+org.apache.http.params
+org.json
+org.w3c.dom
+org.w3c.dom.ls
+org.xml.sax
+org.xml.sax.ext
+org.xml.sax.helpers
+org.xmlpull.v1
+org.xmlpull.v1.sax2
+
diff --git a/engine/src/flutter/tools/gen_javadoc.py b/engine/src/flutter/tools/javadoc/gen_javadoc.py
similarity index 83%
rename from engine/src/flutter/tools/gen_javadoc.py
rename to engine/src/flutter/tools/javadoc/gen_javadoc.py
index 6a35a13b8c..b1ed22ceb0 100755
--- a/engine/src/flutter/tools/gen_javadoc.py
+++ b/engine/src/flutter/tools/javadoc/gen_javadoc.py
@@ -11,15 +11,15 @@ import sys
 
 ANDROID_SRC_ROOT = 'flutter/shell/platform/android'
 
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
 def JavadocBin():
-  script_path = os.path.dirname(os.path.realpath(__file__))
   if sys.platform == 'darwin':
-    return os.path.join(script_path, '..', '..', 'third_party', 'java', 'openjdk', 'Contents', 'Home', 'bin', 'javadoc')
+    return os.path.join(SCRIPT_DIR, '..', '..', '..', 'third_party', 'java', 'openjdk', 'Contents', 'Home', 'bin', 'javadoc')
   elif sys.platform.startswith(('cygwin', 'win')):
-    return os.path.join(script_path, '..', '..', 'third_party', 'java', 'openjdk', 'bin', 'javadoc.exe')
+    return os.path.join(SCRIPT_DIR, '..', '..', '..', 'third_party', 'java', 'openjdk', 'bin', 'javadoc.exe')
   else :
-    return os.path.join(script_path, '..', '..', 'third_party', 'java', 'openjdk', 'bin', 'javadoc')
+    return os.path.join(SCRIPT_DIR, '..', '..', '..', 'third_party', 'java', 'openjdk', 'bin', 'javadoc')
 
 
 def main():
@@ -70,11 +70,13 @@ def main():
     'io.flutter.view',
   ]
 
+  android_package_list = os.path.join(SCRIPT_DIR, 'android_reference')
+
   command = [
     JavadocBin(),
     '-classpath', ':'.join(classpath),
     '-d', args.out_dir,
-    '-link', 'https://developer.android.com/reference/',
+    '-linkoffline', 'https://developer.android.com/reference/', android_package_list,
     '-source', '1.8',
   ] + packages