[Android-tools-devel] Bug#982189: android-platform-build: unsatisfiable cross Build-Depends: javahelper

[Helmut Grohne]

Source: android-platform-build
Version: 1:10.0.0+r36-1
Tags: patch
User: debian-cross at lists.debian.org
Usertags: cross-satisfiability

android-platform-build cannot be cross built from source, because its
javahelper dependency is not satisfiable. The package has mostly split
its dependencies to B-D-A and B-D-I except for this javahelper
dependency, which is almost unused in an arch-only build. The key to
make it unused is twofold:
 * The addon must become conditional to performing an indep build. The
   easiest way of doing so is requesting it via dh-sequence-javahelper,
   which can be moved to B-D-I.
 + In addition java-vars.mk must not be included in an arch build.
   Fortunately, it is unused.

Please consider applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru android-platform-build-10.0.0+r36/debian/changelog android-platform-build-10.0.0+r36/debian/changelog
--- android-platform-build-10.0.0+r36/debian/changelog	2021-01-02 22:32:31.000000000 +0100
+++ android-platform-build-10.0.0+r36/debian/changelog	2021-02-07 10:48:43.000000000 +0100
@@ -1,3 +1,13 @@
+android-platform-build (1:10.0.0+r36-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Reduce Build-Depends: (Closes: #-1)
+    + Replace dh arg --with javahelper with dh-sequence-javahelper dependency.
+    + Drop unused makefile includes.
+    + Demote dh-sequence-javahelper to Build-Depends-Indep.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sun, 07 Feb 2021 10:48:43 +0100
+
 android-platform-build (1:10.0.0+r36-1) unstable; urgency=medium
 
   * New upstream version (Closes: #975747)
diff --minimal -Nru android-platform-build-10.0.0+r36/debian/control android-platform-build-10.0.0+r36/debian/control
--- android-platform-build-10.0.0+r36/debian/control	2021-01-02 22:19:43.000000000 +0100
+++ android-platform-build-10.0.0+r36/debian/control	2021-02-07 10:48:43.000000000 +0100
@@ -7,7 +7,6 @@
            Chirayu Desai <chirayudesai1 at gmail.com>
 Build-Depends:
  debhelper-compat (= 12),
- javahelper
 Build-Depends-Arch:
  android-libandroidfw-dev (>= 1:10.0.0+r36~),
  android-libbase-dev (>= 1:10.0.0+r36~),
@@ -18,6 +17,7 @@
  zlib1g-dev
 Build-Depends-Indep:
  default-jdk-headless | default-jdk,
+ dh-sequence-javahelper,
  libapksig-java (>= 30.0.3-3~),
  libbcpkix-java,
  libbcprov-java
diff --minimal -Nru android-platform-build-10.0.0+r36/debian/rules android-platform-build-10.0.0+r36/debian/rules
--- android-platform-build-10.0.0+r36/debian/rules	2021-01-02 22:15:08.000000000 +0100
+++ android-platform-build-10.0.0+r36/debian/rules	2021-02-07 10:48:43.000000000 +0100
@@ -3,9 +3,6 @@
 # Security Hardening
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-include /usr/share/dpkg/architecture.mk
-include /usr/share/javahelper/java-vars.mk
-
 export DEB_HOST_MULTIARCH
 export DEB_CPPFLAGS_MAINT_APPEND = -DNDEBUG -I/usr/include/android
 export DEB_LDFLAGS_MAINT_APPEND = -fPIC
@@ -46,7 +43,7 @@
 	jh_build --javacopts="-encoding UTF-8 -source 1.9 -target 1.9" --no-javadoc --main=com.android.signtos.SignTos $@ tools/signtos/
 
 %:
-	dh $@ --with javahelper
+	dh $@
 
 override_dh_auto_build-arch: makeparallel zipalign ziptime