Unverified Commit 99b49adf authored by boklm's avatar boklm
Browse files

Bug 30089: Use apksigner instead of jarsigner

parent c10e19ff
......@@ -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
......
......@@ -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
......
......@@ -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
......@@ -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
......
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment