Pier Angelo Vendrame pushed to branch tor-browser-102.2.1-12.0-1 at The Tor Project / Applications / fenix

Commits: 60a5e795 by Pier Angelo Vendrame at 2022-10-03T12:29:43+02:00 fixup! Add Tor integration and UI

Added Tor-related binary dependencies to .gitignore

- - - - - 20676d09 by Pier Angelo Vendrame at 2022-10-03T15:34:50+02:00 fixup! Modify build system

Added a script to sign local builds

- - - - -

2 changed files:

- .gitignore - + tools/tba-sign-devbuilds.sh

Changes:

===================================== .gitignore ===================================== @@ -108,3 +108,9 @@ manifest.json # Other files modified at build time .experimenter.json

+# Tor libraries for local builds +app/android-release.aar +app/jsocksAndroid-release.aar +app/service-release.aar +app/universal-0.0.3.jar +

===================================== tools/tba-sign-devbuilds.sh ===================================== @@ -0,0 +1,47 @@ +#!/bin/bash + +cd "$(dirname $(realpath "$0"))/.." + +if [ -z "$TOR_BROWSER_BUILD" ]; then + TOR_BROWSER_BUILD=../tor-browser-build +fi +key="$TOR_BROWSER_BUILD/projects/browser/android-qa.keystore" +if [ ! -f "$key" ]; then + echo "Please define TOR_BROWSER_BUILD with the path to tor-browser-build" + exit 2 +fi + +tools="$ANDROID_HOME/build-tools/31.0.0" +apksigner="$tools/apksigner" +zipalign="$tools/zipalign" +if [ ! -x "$apksigner" ]; then + echo "apksigner not found at $apksigner. Please make sure ANDROID_HOME is defined" + exit 3 +fi + +noscript="$(find "$TOR_BROWSER_BUILD/out/browser" -name 'noscript*.xpi' -print | sort | tail -1)" +tmpdir="$(mktemp -d)" +mkdir -p "$tmpdir/assets/extensions" +if [ -f "$noscript" ]; then + cp "$noscript" "$tmpdir/assets/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" +fi + +sign () { + apk="$(realpath $1)" + out="$apk" + out="${out/unsigned/signed}" + aligned="$apk" + aligned="${aligned/unsigned/aligned}" + pushd "$tmpdir" > /dev/null + zip -Xr "$apk" assets > /dev/null + popd > /dev/null + rm -f "$aligned" + "$zipalign" -p 4 "$apk" "$aligned" + "$apksigner" sign --ks "$key" --in "$aligned" --out "$out" --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android +} + +for apk in app/build/outputs/apk/release/*-unsigned.apk; do + sign "$apk" +done + +rm -rf "$tmpdir"

View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/f65a567acb019...