diff -pruN 6.0.1+r72-6/debian/build.gradle 6.0.1+r72-6ubuntu2/debian/build.gradle
--- 6.0.1+r72-6/debian/build.gradle	2020-10-08 18:29:59.000000000 +0000
+++ 6.0.1+r72-6ubuntu2/debian/build.gradle	2024-03-06 22:25:36.000000000 +0000
@@ -25,7 +25,7 @@ subprojects {
       def sourceFiles = sourceSets.forStubs.allJava.join(' ')
       def classpath = configurations.forStubs.collect().join(':')
       def docletpath = "${configurations.doclava.collect().join(':')}:" +
-                       '/usr/lib/jvm/default-java/lib/tools.jar'
+                       '/usr/lib/jvm/java-8-openjdk-amd64/lib/tools.jar'
       def stubsDir = "${buildDir}/stubs"
       def javaFlags = "-classpath $docletpath com.google.doclava.Doclava "
       /* From frameworks/base/Android.mk */
@@ -41,14 +41,13 @@ subprojects {
                          "-stubs $stubsDir " +
                          '-XDignore.symbol.file ' +
                          "-api ${temporaryDir}/current.txt " +
-                         "-removedApi ${temporaryDir}/removed.txt " +
-                         '--release 8 '
+                         "-removedApi ${temporaryDir}/removed.txt "
       if (classpath.size() > 0) doclavaFlags += "-classpath $classpath "
       copy {
         from apiListLocation
         into temporaryDir
       }
-      def process = "java $javaFlags $sourceFiles $doclavaFlags".execute()
+      def process = "/usr/lib/jvm/java-8-openjdk-amd64/bin/java $javaFlags $sourceFiles $doclavaFlags".execute()
       process.waitForProcessOutput(System.out, System.err)
       if (process.exitValue() != 0) {
         throw new TaskExecutionException('Failed to generate stubs source.', null)
diff -pruN 6.0.1+r72-6/debian/changelog 6.0.1+r72-6ubuntu2/debian/changelog
--- 6.0.1+r72-6/debian/changelog	2020-12-31 11:49:26.000000000 +0000
+++ 6.0.1+r72-6ubuntu2/debian/changelog	2025-12-09 20:38:30.000000000 +0000
@@ -1,3 +1,15 @@
+android-framework-23 (6.0.1+r72-6ubuntu2) resolute; urgency=medium
+
+  * No-change mass rebuild for Ubuntu 26.04 (LP: #2132257)
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Tue, 09 Dec 2025 20:38:30 +0000
+
+android-framework-23 (6.0.1+r72-6ubuntu1) noble; urgency=medium
+
+  * d/build.gradle: use openjdk-8 to invoke doclava (LP: #2056085).
+
+ -- Vladimir Petko <vladimir.petko@canonical.com>  Thu, 07 Mar 2024 14:06:18 +1300
+
 android-framework-23 (6.0.1+r72-6) unstable; urgency=medium
 
   * source-only upload
diff -pruN 6.0.1+r72-6/debian/control 6.0.1+r72-6ubuntu2/debian/control
--- 6.0.1+r72-6/debian/control	2020-10-08 17:46:26.000000000 +0000
+++ 6.0.1+r72-6ubuntu2/debian/control	2024-03-07 01:06:18.000000000 +0000
@@ -1,7 +1,8 @@
 Source: android-framework-23
 Section: java
 Priority: optional
-Maintainer: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
 Uploaders: Hans-Christoph Steiner <hans@eds.org>,
            Kai-Chung Yan <seamlikok@gmail.com>,
            Chirayu Desai <chirayudesai1@gmail.com>