[tbb-commits] [tor-browser-build/master] Bug 30089: Use apksigner instead of jarsigner

[gk at torproject.org]

commit 99b49adf8e049ff5d5c091485fb3a45b6e6e359c
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Wed Apr 10 12:28:03 2019 +0200

    Bug 30089: Use apksigner instead of jarsigner
---
 projects/android-toolchain/build   | 4 +---
 projects/debootstrap-image/config  | 8 --------
 projects/tor-browser/build.android | 2 +-
 projects/tor-browser/config        | 6 +-----
 rbm.conf                           | 2 ++
 5 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build
index ff899d2..9fe40f7 100644
--- a/projects/android-toolchain/build
+++ b/projects/android-toolchain/build
@@ -21,9 +21,7 @@ rm -fR android-ndk-r15c
 # The architectures we support
 archs="arm x86"
 for arch in $archs; do
-  # API 16 is the minimum we currently support for Tor Browser on Android for
-  # 32bit.
-  ./build/tools/make_standalone_toolchain.py --api 16 --arch $arch --install-dir=./$arch
+  ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api") %] --arch $arch --install-dir=./$arch
 done
 
 # Tool Archives
diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config
index 7d535ec..7fa3551 100644
--- a/projects/debootstrap-image/config
+++ b/projects/debootstrap-image/config
@@ -94,14 +94,6 @@ targets:
         suite: jessie
         arch: i386
 
-  # Still needed to fix faketime issues in tor-browser for Android, see: #29453
-  buster-amd64:
-    var:
-      minimal_apt_version: '1.8.0~alpha3.1'
-      container:
-        suite: buster
-        arch: amd64
-
   stretch-amd64:
     var:
       minimal_apt_version: 1.4.9
diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android
index 2de8d36..ffaf93d 100644
--- a/projects/tor-browser/build.android
+++ b/projects/tor-browser/build.android
@@ -25,4 +25,4 @@ zip -d $apk lib/armeabi/tor.so
 [% END %]
 
 # Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest
-[% c("var/faketime") %] jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore $rootdir/android-qa.keystore -signedjar $qa_apk $apk androidqakey -storepass android -keypass android
+java -jar /usr/share/apksigner/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 0a82092..c14b9d7 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -52,11 +52,7 @@ targets:
     var:
       arch_deps:
         - openjdk-8-jdk
-        - faketime
-      # On some machines using faketime with Stretch to make the debug signature
-      # leads to a stalled build. Work around this by switching to Buster.
-      container:
-        suite: buster
+        - apksigner
 
 input_files:
   - project: container-image
diff --git a/rbm.conf b/rbm.conf
index 1a0c6ca..7be1106 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -191,6 +191,8 @@ targets:
     var:
       android: 1
       compiler: android-toolchain
+      # API 16 is the minimum we currently support for Tor Browser on Android
+      android_min_api: 16
       snowflake: 0
       fteproxy: 0
       container: