[tor-commits] [Git][tpo/applications/fenix][tor-browser-102.2.1-12.5-1] fixup! Modify build system

[ma1 (@ma1)]

ma1 pushed to branch tor-browser-102.2.1-12.5-1 at The Tor Project / Applications / fenix


Commits:
5c26f235 by Pier Angelo Vendrame at 2023-03-21T11:14:21+01:00
fixup! Modify build system

Bug 41684: Android improvements for local dev builds

Added a script to fetch the Tor dependencies from tor-browser-build,
and print the name of the signed apk.

- - - - -


2 changed files:

- + tools/tba-fetch-deps.sh
- tools/tba-sign-devbuilds.sh


Changes:

=====================================
tools/tba-fetch-deps.sh
=====================================
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+cd "$(dirname $(realpath "$0"))/.."
+
+if [ -z "$TOR_BROWSER_BUILD" ]; then
+	TOR_BROWSER_BUILD=../tor-browser-build
+fi
+
+android_service="$(ls -1td "$TOR_BROWSER_BUILD/out/tor-android-service/"tor-android-service-* | head -1)"
+if [ -z "$android_service" ]; then
+	echo "Cannot find Tor Android Service artifacts!"
+	exit 1
+fi
+
+onion_proxy_library="$(ls -1td "$TOR_BROWSER_BUILD/out/tor-onion-proxy-library/"tor-onion-proxy-library-* | head -1)"
+if [ -z "$onion_proxy_library" ]; then
+	echo "Cannot find Tor Onoin Proxy library artifacts!"
+	exit 2
+fi
+
+cp "$android_service"/* app/
+cp "$onion_proxy_library"/* app/


=====================================
tools/tba-sign-devbuilds.sh
=====================================
@@ -38,6 +38,7 @@ sign () {
 	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
+	echo "Signed $out"
 }
 
 for apk in app/build/outputs/apk/release/*-unsigned.apk; do



View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/5c26f2353ef1ae1756cfee563db6f06614a76bd4

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/5c26f2353ef1ae1756cfee563db6f06614a76bd4
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230321/d7b0b220/attachment-0001.htm>