Merge ~vpa1977/ubuntu/+source/android-framework-23:test-openjdk-8 into ubuntu/+source/android-framework-23:ubuntu/devel

[Vladimir Petko]

This MP resolves ftbfs due to the missing doclava. It uses openjdk-8 to run it since doclava depends on private APIs from lib/tools.jar

PPA: ppa:vpa1977/plusone [1]

Changes:
 - Run doclava using openjdk-8

Testing:
 - package builds against updated doclava [2]
 - piuparts test [3]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone/+sourcepub/15841297/+listing-archive-extra
[3] https://bugs.launchpad.net/ubuntu/+source/android-framework-23/+bug/2056085/comments/1

[Vladimir Petko (vpa1977)]

Note: using openjdk-8 violates Debian Java policy[1]
---
Packages must be built with default-jdk. This package provides a dependency on the recommended Java Development Kit. If needed, the right JAVA_HOME is /usr/lib/jvm/default-java/
---
This can not be forwarded to Debian

[1] https://www.debian.org/doc/packaging-manuals/java-policy/ch02.html

[Pushkar Kulkarni (pushkarnk)]

review: Approve

diff --git a/debian/build.gradle b/debian/build.gradle
index 3c6c652..dc35e6e 100644
--- a/debian/build.gradle
+++ b/debian/build.gradle
@@ -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 --git a/debian/changelog b/debian/changelog
index 1b3cce3..33acf8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+android-framework-23 (6.0.1+r72-6ubuntu1) noble; urgency=medium
+
+  * d/build.gradle: use openjdk-8 to invoke doclava (LP: #2056085).
+
+ -- Vladimir Petko <[e-mail]>  Thu, 07 Mar 2024 14:06:18 +1300
+
 android-framework-23 (6.0.1+r72-6) unstable; urgency=medium
 
   * source-only upload
diff --git a/debian/control b/debian/control
index bbc2cd4..b4ec5d7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: android-framework-23
 Section: java
 Priority: optional
-Maintainer: Android Tools Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Android Tools Maintainers <[e-mail]>
 Uploaders: Hans-Christoph Steiner <[e-mail]>,
            Kai-Chung Yan <[e-mail]>,
            Chirayu Desai <[e-mail]>