[tor-commits] [builders/tor-browser-build] 08/08: 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.

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

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

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

diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config
index 8aa5e22..bcb33ca 100644
--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
@@ -24,7 +24,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_31") %]:$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..3fcf8fd 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
@@ -33,6 +34,6 @@ mv $rootdir/allowed_addons.json $assets_dir/allowed_addons.json
 
 # 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 $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 d152e59..9c2c63d 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -45,8 +45,7 @@ targets:
   android:
     build: '[% INCLUDE build.android %]'
     var:
-      arch_deps:
-        - apksigner
+      android_toolchain_version: 31.0.0
       verify_allowed_addons: 1
 
 input_files:
@@ -101,6 +100,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.