[tor-commits] [builders/tor-browser-build] branch master updated: fixup! Bug 40202: Sign Fenix QA apks with the latest version of apksign

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch master
in repository builders/tor-browser-build.

The following commit(s) were added to refs/heads/master by this push:
     new 05cec20  fixup! Bug 40202: Sign Fenix QA apks with the latest version of apksign
05cec20 is described below

commit 05cec200d5cd9e54892398ba5c1ecab847d70063
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Fri Apr 29 12:10:34 2022 +0200

    fixup! Bug 40202: Sign Fenix QA apks with the latest version of apksign
---
 projects/tor-browser/build.android | 5 ++++-
 projects/tor-browser/config        | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android
index 3fcf8fd..2e1b11f 100644
--- a/projects/tor-browser/build.android
+++ b/projects/tor-browser/build.android
@@ -32,8 +32,11 @@ mv $rootdir/allowed_addons.json $assets_dir/allowed_addons.json
         zip_args => '$apk',
     }) %]
 
+aligned_apk=$(basename $apk .apk)_aligned.apk
+zipalign -vp 4 $apk $aligned_apk
+
 # Sign a QA build. This .apk is not a debug version and doesn't contain a debug
 # flag in the manifest.
-apksigner 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
+apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $aligned_apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android
 
 apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $test_out_apk --in $test_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 b30d5e3..d1a889f 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -45,7 +45,6 @@ targets:
   android:
     build: '[% INCLUDE build.android %]'
     var:
-      android_toolchain_version: 31.0.0
       verify_allowed_addons: 1
 
 input_files:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.