[tor-commits] [builders/tor-browser-build] branch maint-11.0 updated: Bug 40202: Make QA APKs compatible with R+

[gitolite role]

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

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

The following commit(s) were added to refs/heads/maint-11.0 by this push:
     new e34fb7c  Bug 40202: Make QA APKs compatible with R+
e34fb7c is described below

commit e34fb7c3f51183b479609ca56fe92ffd80a14210
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Thu Apr 21 11:23:31 2022 +0200

    Bug 40202: Make QA APKs compatible with R+
---
 projects/android-toolchain/config  | 2 +-
 projects/tor-browser/build.android | 8 ++++++--
 projects/tor-browser/config        | 5 +++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config
index a964f7d..5661e89 100644
--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
@@ -23,7 +23,7 @@ var:
     export NDK_HOST_TAG=linux-x86_64
     export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle
     export GRADLE_USER_HOME=$GRADLE_HOME
-    export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin
+    export PATH=$PATH:$ANDROID_HOME/build-tools/[% c("var/version_30") %]:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin
     mkdir -p "$GRADLE_HOME"
   google_repo: https://dl.google.com/android/repository
   android_api_level: 31
diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android
index e9354bd..2e1b11f 100644
--- a/projects/tor-browser/build.android
+++ b/projects/tor-browser/build.android
@@ -1,5 +1,6 @@
 #!/bin/bash
 [% c("var/set_default_env") -%]
+[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
 assets_dir=assets
 ext_dir=$assets_dir/extensions
 qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-multi-qa.apk
@@ -31,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.
-java -jar /usr/lib/android-sdk/build-tools/debian/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
+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
 
-java -jar /usr/lib/android-sdk/build-tools/debian/apksigner.jar 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
+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 56b217d..295fa9c 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -45,8 +45,6 @@ targets:
   android:
     build: '[% INCLUDE build.android %]'
     var:
-      arch_deps:
-        - apksigner
       verify_allowed_addons: 1
 
 input_files:
@@ -101,6 +99,9 @@ input_files:
   # To generate a new keystore, see how-to-generate-keystore.txt
   - filename: android-qa.keystore
     enable: '[% c("var/android") %]'
+  - name: '[% c("var/compiler") %]'
+    project: '[% c("var/compiler") %]'
+    enable: '[% c("var/android") %]'
   - name: electrum-nmc
     project: electrum-nmc
     enable: '[% c("var/namecoin") %]'

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