[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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



Title: GitLab

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:

Changes:

  • tools/tba-fetch-deps.sh
    1
    +#!/bin/bash
    
    2
    +
    
    3
    +cd "$(dirname $(realpath "$0"))/.."
    
    4
    +
    
    5
    +if [ -z "$TOR_BROWSER_BUILD" ]; then
    
    6
    +	TOR_BROWSER_BUILD=../tor-browser-build
    
    7
    +fi
    
    8
    +
    
    9
    +android_service="$(ls -1td "$TOR_BROWSER_BUILD/out/tor-android-service/"tor-android-service-* | head -1)"
    
    10
    +if [ -z "$android_service" ]; then
    
    11
    +	echo "Cannot find Tor Android Service artifacts!"
    
    12
    +	exit 1
    
    13
    +fi
    
    14
    +
    
    15
    +onion_proxy_library="$(ls -1td "$TOR_BROWSER_BUILD/out/tor-onion-proxy-library/"tor-onion-proxy-library-* | head -1)"
    
    16
    +if [ -z "$onion_proxy_library" ]; then
    
    17
    +	echo "Cannot find Tor Onoin Proxy library artifacts!"
    
    18
    +	exit 2
    
    19
    +fi
    
    20
    +
    
    21
    +cp "$android_service"/* app/
    
    22
    +cp "$onion_proxy_library"/* app/

  • tools/tba-sign-devbuilds.sh
    ... ... @@ -38,6 +38,7 @@ sign () {
    38 38
     	rm -f "$aligned"
    
    39 39
     	"$zipalign" -p 4 "$apk" "$aligned"
    
    40 40
     	"$apksigner" sign --ks "$key" --in "$aligned" --out "$out" --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android
    
    41
    +	echo "Signed $out"
    
    41 42
     }
    
    42 43
     
    
    43 44
     for apk in app/build/outputs/apk/release/*-unsigned.apk; do
    

  • _______________________________________________
    tor-commits mailing list
    tor-commits@xxxxxxxxxxxxxxxxxxxx
    https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits