December 2024 - tbb-commits - lists.torproject.org

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.5.0esr-14.5-1] 3 commits: fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 04 Dec '24

04 Dec '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 93162bec by cypherpunks1 at 2024-12-04T10:41:13+01:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 43334: Restore RemoteSettings dumps for devtools-compatibility-browsers and devtools-devices - - - - - cc08546c by NoisyCoil at 2024-12-04T10:41:53+01:00 fixup! Base Browser's .mozconfigs. Bug 43340: Add mozconfig-linux-aarch64-dev Copy mozconfig-linux-x86_64-dev, except that linux-aarch64 does not support the {enable,disable}-eme options - - - - - 5f129674 by Pier Angelo Vendrame at 2024-12-04T10:43:03+01:00 fixup! MB 38: Mullvad Browser configuration Bug 43340: Add mozconfig-linux-aarch64-dev - - - - - 2 changed files: - + mozconfig-linux-aarch64-dev - services/settings/dumps/main/moz.build Changes: ===================================== mozconfig-linux-aarch64-dev ===================================== @@ -0,0 +1,19 @@ +. $topsrcdir/browser/config/mozconfigs/mullvad-browser + +# This mozconfig file is not used in official builds. +# It is only intended to be used when doing incremental Linux builds +# during development. + +# Moz switched to lld for all Linux targets in Bug 1839739. +ac_add_options --enable-linker=lld + +export MOZILLA_OFFICIAL= +ac_add_options --with-branding=browser/branding/mb-nightly + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +ac_add_options --with-base-browser-version=dev-build +ac_add_options --disable-base-browser-update ===================================== services/settings/dumps/main/moz.build ===================================== @@ -14,6 +14,8 @@ if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"): FINAL_TARGET_FILES.defaults.settings.main += [ "anti-tracking-url-decoration.json", "cookie-banner-rules-list.json", + "devtools-compatibility-browsers.json", + "devtools-devices.json", "example.json", "hijack-blocklists.json", "password-rules.json", View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/eb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/eb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.5.0esr-14.5-1] Bug 43340: Add mozconfig-linux-aarch64-dev
by Pier Angelo Vendrame (＠pierov) 04 Dec '24

04 Dec '24

Pier Angelo Vendrame pushed to branch base-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 47f3899c by NoisyCoil at 2024-12-04T10:40:10+01:00 Bug 43340: Add mozconfig-linux-aarch64-dev Copy mozconfig-linux-x86_64-dev, except that linux-aarch64 does not support the {enable,disable}-eme options - - - - - 1 changed file: - + mozconfig-linux-aarch64-dev Changes: ===================================== mozconfig-linux-aarch64-dev ===================================== @@ -0,0 +1,18 @@ +. $topsrcdir/browser/config/mozconfigs/base-browser + +# This mozconfig file is not used in official builds. +# It is only intended to be used when doing incremental Linux builds +# during development. + +# Moz switched to lld for all Linux targets in Bug 1839739. +ac_add_options --enable-linker=lld + +export MOZILLA_OFFICIAL= + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +ac_add_options --with-base-browser-version=dev-build +ac_add_options --disable-base-browser-update View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/47f3899… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/47f3899… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.5.0esr-14.5-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 04 Dec '24

04 Dec '24

Pier Angelo Vendrame pushed to branch base-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 857bd22e by cypherpunks1 at 2024-12-04T10:38:17+01:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 43334: Restore RemoteSettings dumps for devtools-compatibility-browsers and devtools-devices - - - - - 1 changed file: - services/settings/dumps/main/moz.build Changes: ===================================== services/settings/dumps/main/moz.build ===================================== @@ -14,6 +14,8 @@ if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"): FINAL_TARGET_FILES.defaults.settings.main += [ "anti-tracking-url-decoration.json", "cookie-banner-rules-list.json", + "devtools-compatibility-browsers.json", + "devtools-devices.json", "example.json", "hijack-blocklists.json", "password-rules.json", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/857bd22… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/857bd22… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 04 Dec '24

04 Dec '24

Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 395fc108 by cypherpunks1 at 2024-12-04T09:32:06+00:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 43334: Restore RemoteSettings dumps for devtools-compatibility-browsers and devtools-devices - - - - - 1 changed file: - services/settings/dumps/main/moz.build Changes: ===================================== services/settings/dumps/main/moz.build ===================================== @@ -14,6 +14,8 @@ if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"): FINAL_TARGET_FILES.defaults.settings.main += [ "anti-tracking-url-decoration.json", "cookie-banner-rules-list.json", + "devtools-compatibility-browsers.json", + "devtools-devices.json", "example.json", "hijack-blocklists.json", "password-rules.json", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/395fc10… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/395fc10… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] 2 commits: Revert "Bug 43099: 2024 YEC"
by morgan (＠morgan) 03 Dec '24

03 Dec '24

morgan pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: f905a88c by Pier Angelo Vendrame at 2024-12-03T19:11:20+00:00 Revert "Bug 43099: 2024 YEC" Bug 43343: Revert YEC 2024 This reverts commit 245cd26bd665facee04c41032efd5687ed8dc625. - - - - - 035f30c6 by Pier Angelo Vendrame at 2024-12-03T19:11:20+00:00 Revert "Bug 43098: Year End Campaign 2024." Bug 43343: Revert YEC 2024 This reverts commit 31d3d5e6556a254802ad3f9754497305c2c77187. - - - - - 17 changed files: - browser/components/BrowserGlue.sys.mjs - browser/components/abouttor/AboutTorChild.sys.mjs - browser/components/abouttor/AboutTorParent.sys.mjs - browser/components/abouttor/content/aboutTor.css - browser/components/abouttor/content/aboutTor.html - browser/components/abouttor/content/aboutTor.js - − browser/components/abouttor/content/yec-2024-browse.svg - − browser/components/abouttor/content/yec-2024-fonts.css - − browser/components/abouttor/content/yec-2024-heart.svg - − browser/components/abouttor/content/yec-2024-search.svg - − browser/components/abouttor/content/yec-2024-speak.svg - browser/components/abouttor/jar.mn - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeScreenViewModel.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - − mobile/android/fenix/app/src/main/res/drawable/heart.xml - − mobile/android/fenix/app/src/main/res/drawable/illo_green_browse.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c1951f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c1951f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] 3 commits: Bug 43340: Add mozconfig-linux-aarch64-dev
by morgan (＠morgan) 03 Dec '24

03 Dec '24

morgan pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: d1eed871 by NoisyCoil at 2024-12-03T18:56:33+00:00 Bug 43340: Add mozconfig-linux-aarch64-dev Copy mozconfig-linux-x86_64-dev, except that linux-aarch64 does not support the {enable,disable}-eme options - - - - - 85faa5f2 by NoisyCoil at 2024-12-03T18:56:33+00:00 Bug 43340: Fetch aarch64 alphas for linux aarch64 dev builds - - - - - c1951fdb by NoisyCoil at 2024-12-03T18:56:33+00:00 Bug 43340: Use the correct vendor in linux aarch64 dev builds - - - - - 3 changed files: - + mozconfig-linux-aarch64-dev - tools/torbrowser/Makefile - tools/torbrowser/fetch.sh Changes: ===================================== mozconfig-linux-aarch64-dev ===================================== @@ -0,0 +1,20 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +# This mozconfig file is not used in official builds. +# It is only intended to be used when doing incremental Linux builds +# during development. + +# Moz switched to lld for all Linux targets in Bug 1839739. +ac_add_options --enable-linker=lld + +export MOZILLA_OFFICIAL= +export MOZ_APP_REMOTINGNAME="Tor Browser Dev" +ac_add_options --with-branding=browser/branding/tb-nightly + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +ac_add_options --with-base-browser-version=dev-build +ac_add_options --disable-base-browser-update ===================================== tools/torbrowser/Makefile ===================================== @@ -12,11 +12,17 @@ ifeq ($(ARCHITECTURE), "arm64") ARCHITECTURE = "aarch64" endif +ifeq ($(ARCHITECTURE), "aarch64") + LINUX_VENDOR = "unknown" +else + LINUX_VENDOR = "pc" +endif + # Define build output path based on the platform. ifeq ("$(shell uname)", "Darwin") BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-apple-darwin$(shell uname -r)" else - BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-pc-linux-gnu" + BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-$(LINUX_VENDOR)-linux-gnu" endif # Define the run command based on the platform. ===================================== tools/torbrowser/fetch.sh ===================================== @@ -10,7 +10,7 @@ TOR_BROWSER_VERSION=$(grep -Eo "\"version\":\"[0-9.a]+\"" downloads.json | grep if [ "$(uname)" = "Darwin" ]; then TOR_BROWSER_PACKAGE="tor-browser-macos-${TOR_BROWSER_VERSION}.dmg" else - TOR_BROWSER_PACKAGE="tor-browser-linux-x86_64-${TOR_BROWSER_VERSION}.tar.xz" + TOR_BROWSER_PACKAGE="tor-browser-linux-$(uname -m)-${TOR_BROWSER_VERSION}.tar.xz" fi TOR_BROWSER_PACKAGE_URL="https://dist.torproject.org/torbrowser/${TOR_BROWSER_VERSION}/${TOR_BROWSER…" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/efd91f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/efd91f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.0-1] 2 commits: fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Pier Angelo Vendrame (＠pierov) 03 Dec '24

03 Dec '24

Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 096588f1 by Pier Angelo Vendrame at 2024-12-03T10:09:31+01:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 42690: Add a Makefile target to build APKs. Now that we use a monorepo, we can extend our existing tools to build also Fenix and to install it via adb. Also, update the env templates. - - - - - 174d3f74 by Pier Angelo Vendrame at 2024-12-03T10:09:33+01:00 fixup! [android] Modify build system Bug 42690: Add a Makefile target to build APKs. Update the paths on tba-sign-devbuilds.sh (and make them more generic when possible). - - - - - 10 changed files: - mobile/android/fenix/tools/tba-sign-devbuilds.sh - tools/geckoview/Makefile - tools/geckoview/android-env-linux-template.sh - tools/geckoview/android-env-macos-template.sh - + tools/geckoview/build-fenix.sh - tools/geckoview/build.sh → tools/geckoview/build-geckoview.sh - tools/geckoview/clobber.sh - tools/geckoview/config.sh - − tools/geckoview/fataar.py - − tools/geckoview/package-gradle.sh Changes: ===================================== mobile/android/fenix/tools/tba-sign-devbuilds.sh ===================================== @@ -2,20 +2,38 @@ cd "$(dirname $(realpath "$0"))/.." -if [ -z "$TOR_BROWSER_BUILD" ]; then - TOR_BROWSER_BUILD=../../tor-browser-build +if [ -z "$APKSIGNER_ARGS" ]; then + if [ -z "$QA_KEY" ]; then + if [ -z "$TOR_BROWSER_BUILD" ]; then + TOR_BROWSER_BUILD=../../../../tor-browser-build + fi + QA_KEY="$TOR_BROWSER_BUILD/projects/browser/android-qa.keystore" + fi + if [ ! -f "$QA_KEY" ]; then + echo "The QA key has not been found." + echo "Please define either \$QA_KEY with its path, or \$TOR_BROWSER_BUILD with the path to tor-browser-build" + exit 2 + fi + APKSIGNER_ARGS="--ks "$QA_KEY" --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android" 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 + +if [ -z "$ANDROID_HOME" ]; then + ANDROID_HOME=~/Android 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" +function find_tool() { + tool="$(find $ANDROID_HOME -name "$1" | head -1)" + if [ -z "$tool" ]; then + tool=$(which $1) + fi + echo $tool +} + +apksigner="$(find_tool apksigner)" +zipalign="$(find_tool zipalign)" +if [ -z "$apksigner" -o ! -x "$apksigner" -o -z "$zipalign" -o ! -x "$zipalign" ]; then + echo "apksigner or zipalign not found." + echo "Please make sure they are on your \$PATH, or define \$ANDROID_HOME." exit 3 fi @@ -40,8 +58,8 @@ sign () { 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 - echo "Signed $out" + echo "Signing $out" + "$apksigner" sign --in "$aligned" --out "$out" $APKSIGNER_ARGS } for channel in app/build/outputs/apk/fenix/*; do ===================================== tools/geckoview/Makefile ===================================== @@ -1,9 +1,15 @@ .DEFAULT_GOAL := all # one of armv7 aarch64 x86 x86_64 -ARCH=aarch64 +ARCH := aarch64 +ANDROID_ARCH := $(ARCH) +ifeq ($(ANDROID_ARCH),aarch64) + ANDROID_ARCH := arm64-v8a +endif +ifeq ($(ANDROID_ARCH),armv7) + ANDROID_ARCH := armeabi-v7a +endif -ARCHS=$(ARCH) OS="${shell uname}" # https://stackoverflow.com/questions/18136918/how-to-get-current-relative-di… @@ -17,23 +23,33 @@ clobber: env config: env ./config.sh $(DEV_ROOT) $(ARCH) -build: env - ./build.sh $(DEV_ROOT) $(ARCH) +geckoview: env + ./build-geckoview.sh $(DEV_ROOT) $(ARCH) -fataar: env - bash -c "source android-env.sh && ./fataar.py $(DEV_ROOT) $(ARCHS)" - -package: env - ./package-gradle.sh $(DEV_ROOT) $(ARCH) - -show: - ls -lh ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni/ - ls -lh ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni/$(shell ls ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni | tail -n 2 | head -n 1) +# These targets do not depend on GeckoView so that you can build only Fenix if +# you are not changing GV code. +fenix-release: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Release +fenix-beta: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Beta +fenix-nightly: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Nightly +fenix-debug: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Debug env: test -e android-env.sh || { echo "copy android-env-...-template.sh to android-env.sh and edit appropriatly"; exit 1; } -all: env build package +install-release: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-fenix-$(ANDROID_ARCH)-release-signed.apk" +install-beta: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/beta/app-fenix-$(ANDROID_ARCH)-beta-signed.apk" +install-nightly: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/nightly/app-fenix-$(ANDROID_ARCH)-nightly-signed.apk" + +all: env geckoview fenix-nightly install-nightly +all-release: env geckoview fenix-release install-release +all-beta: env geckoview fenix-beta install-beta jslint: ./jslint.sh $(DEV_ROOT) $(JS) ===================================== tools/geckoview/android-env-linux-template.sh ===================================== @@ -1,7 +1,6 @@ -export MOZ_BUILD_DATE=20230710165010 # This should match the data in [firefox-android](https://gitlab.torproject.org/tpo/applications/firefox-and… ~ln 12's def of the variable *version*, the date component export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 export ANDROID_HOME=$HOME/.mozbuild/android-sdk-linux/ # or $HOME/Android/Sdk/ # Or .../android-toolchain/android-sdk-linux if you extract android-toolchain from tor-browser-build -export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313/ # for 115esr -export GRADLE_HOME=/FULL/PATH/TO/tor-browser-build/out/gradle/gradle-7.5.1 # Or the version that we currently use +export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/r26c/ # for 128esr +export GRADLE_HOME=/FULL/PATH/TO/tor-browser-build/out/gradle/gradle-8.8 # Or the version that we currently use export LOCAL_DEV_BUILD=1 export PATH=/FULL/PATH/TO/tor-browser-build/out/clang/clang-16.x.y-arm/bin/:$PATH # prepend our newly built and assembled clang to the path so it gets used to build geckoview ===================================== tools/geckoview/android-env-macos-template.sh ===================================== @@ -1,4 +1,3 @@ -export MOZ_BUILD_DATE=20230710165010 # This should match the data in [firefox-android](https://gitlab.torproject.org/tpo/applications/firefox-and… ~ln 12's def of the variable *version*, the date component export JAVA_HOME=/opt/homebrew/opt/openjdk(a)11/libexec/openjdk.jdk/Contents/Home/ # for arm64. Or JAVA_HOME=/usr/local/opt/openjdk(a)11/libexec/openjdk.jdk/Contents/Home/ for x86_64. export ANDROID_HOME=$HOME/Library/Android/sdk # or $HOME/.mozbuild/android-sdk-macosx/ export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313 # will need to download NDK 23.2.8568313 via android studio ===================================== tools/geckoview/build-fenix.sh ===================================== @@ -0,0 +1,11 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 +ARCH=$2 +VARIANT=$3 + +source android-env.sh + +cd $DEV_ROOT/mobile/android/fenix +MOZCONFIG=mozconfig-android-$ARCH $GRADLE_HOME/bin/gradle --no-daemon -Dorg.gradle.jvmargs=-Xmx20g -PdisableOptimization assemble$VARIANT +tools/tba-sign-devbuilds.sh ===================================== tools/geckoview/build.sh → tools/geckoview/build-geckoview.sh ===================================== @@ -6,4 +6,4 @@ ARCH=$2 source android-env.sh cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach build +MOZCONFIG=mozconfig-android-$ARCH ./mach build ===================================== tools/geckoview/clobber.sh ===================================== @@ -7,4 +7,3 @@ source android-env.sh cd $DEV_ROOT MOZCONFIG=mozconfig-android-$ARCH ./mach clobber -MOZCONFIG=mozconfig-android-all ./mach clobber ===================================== tools/geckoview/config.sh ===================================== @@ -6,4 +6,4 @@ ARCH=$2 source android-env.sh cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries +MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries ===================================== tools/geckoview/fataar.py deleted ===================================== @@ -1,52 +0,0 @@ -#!/usr/bin/env python3 -import os -import re -import subprocess -import sys - -dev_root = sys.argv[1] -archs_in = re.split("\\s+|,", sys.argv[2]) if len(sys.argv) >= 3 else [] -archs_out = [] -env = dict(os.environ) - -env["MOZCONFIG"] = "mozconfig-android-all" -if "armv7" in archs_in: - env["MOZ_ANDROID_FAT_AAR_ARMEABI_V7A"] = ( - dev_root - + "/obj-arm-linux-androideabi/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("armeabi-v7a") -if "aarch64" in archs_in: - env["MOZ_ANDROID_FAT_AAR_ARM64_V8A"] = ( - dev_root - + "/obj-aarch64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("arm64-v8a") -if "x86" in archs_in or "i686" in archs_in: - env["MOZ_ANDROID_FAT_AAR_X86"] = ( - dev_root - + "/obj-i386-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("x86") -if "x86_64" in archs_in or "x86-64" in archs_in: - env["MOZ_ANDROID_FAT_AAR_X86_64"] = ( - dev_root - + "/obj-x86_64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("x86_64") -env["MOZ_ANDROID_FAT_AAR_ARCHITECTURES"] = ",".join(archs_out) - -if not archs_out: - print( - "The architectures have not specified or are not valid.", - file=sys.stderr, - ) - print('Usage: make fat-aar ARCHS="$archs"', file=sys.stderr) - print( - "Valid architectures are armv7 aarch64 x86 x86_64, and must be separated with a space.", - file=sys.stderr, - ) - sys.exit(1) - -subprocess.run(["./mach", "configure"], cwd=dev_root, env=env, check=True) -subprocess.run(["./mach", "build"], cwd=dev_root, env=env, check=True) ===================================== tools/geckoview/package-gradle.sh deleted ===================================== @@ -1,15 +0,0 @@ -#!/bin/bash -set -e -DEV_ROOT=$1 -ARCH=$2 - -source android-env.sh - -env ARCHS=$ARCH make fataar - -cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach build binaries -MOZCONFIG=mozconfig-android-$ARCH ./mach gradle geckoview:publishWithGeckoBinariesDebugPublicationToMavenRepository -MOZCONFIG=mozconfig-android-all ./mach gradle geckoview:publishWithGeckoBinariesDebugPublicationToMavenLocal exoplayer2:publishDebugPublicationToMavenLocal - - View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8cad63… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8cad63… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] 2 commits: fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Pier Angelo Vendrame (＠pierov) 03 Dec '24

03 Dec '24

Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 81108ca4 by Pier Angelo Vendrame at 2024-12-03T09:45:46+01:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 42690: Add a Makefile target to build APKs. Now that we use a monorepo, we can extend our existing tools to build also Fenix and to install it via adb. Also, update the env templates. - - - - - efd91fc3 by Pier Angelo Vendrame at 2024-12-03T09:45:52+01:00 fixup! [android] Modify build system Bug 42690: Add a Makefile target to build APKs. Update the paths on tba-sign-devbuilds.sh (and make them more generic when possible). - - - - - 10 changed files: - mobile/android/fenix/tools/tba-sign-devbuilds.sh - tools/geckoview/Makefile - tools/geckoview/android-env-linux-template.sh - tools/geckoview/android-env-macos-template.sh - + tools/geckoview/build-fenix.sh - tools/geckoview/build.sh → tools/geckoview/build-geckoview.sh - tools/geckoview/clobber.sh - tools/geckoview/config.sh - − tools/geckoview/fataar.py - − tools/geckoview/package-gradle.sh Changes: ===================================== mobile/android/fenix/tools/tba-sign-devbuilds.sh ===================================== @@ -2,20 +2,38 @@ cd "$(dirname $(realpath "$0"))/.." -if [ -z "$TOR_BROWSER_BUILD" ]; then - TOR_BROWSER_BUILD=../../tor-browser-build +if [ -z "$APKSIGNER_ARGS" ]; then + if [ -z "$QA_KEY" ]; then + if [ -z "$TOR_BROWSER_BUILD" ]; then + TOR_BROWSER_BUILD=../../../../tor-browser-build + fi + QA_KEY="$TOR_BROWSER_BUILD/projects/browser/android-qa.keystore" + fi + if [ ! -f "$QA_KEY" ]; then + echo "The QA key has not been found." + echo "Please define either \$QA_KEY with its path, or \$TOR_BROWSER_BUILD with the path to tor-browser-build" + exit 2 + fi + APKSIGNER_ARGS="--ks "$QA_KEY" --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android" 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 + +if [ -z "$ANDROID_HOME" ]; then + ANDROID_HOME=~/Android 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" +function find_tool() { + tool="$(find $ANDROID_HOME -name "$1" | head -1)" + if [ -z "$tool" ]; then + tool=$(which $1) + fi + echo $tool +} + +apksigner="$(find_tool apksigner)" +zipalign="$(find_tool zipalign)" +if [ -z "$apksigner" -o ! -x "$apksigner" -o -z "$zipalign" -o ! -x "$zipalign" ]; then + echo "apksigner or zipalign not found." + echo "Please make sure they are on your \$PATH, or define \$ANDROID_HOME." exit 3 fi @@ -40,8 +58,8 @@ sign () { 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 - echo "Signed $out" + echo "Signing $out" + "$apksigner" sign --in "$aligned" --out "$out" $APKSIGNER_ARGS } for channel in app/build/outputs/apk/fenix/*; do ===================================== tools/geckoview/Makefile ===================================== @@ -1,9 +1,15 @@ .DEFAULT_GOAL := all # one of armv7 aarch64 x86 x86_64 -ARCH=aarch64 +ARCH := aarch64 +ANDROID_ARCH := $(ARCH) +ifeq ($(ANDROID_ARCH),aarch64) + ANDROID_ARCH := arm64-v8a +endif +ifeq ($(ANDROID_ARCH),armv7) + ANDROID_ARCH := armeabi-v7a +endif -ARCHS=$(ARCH) OS="${shell uname}" # https://stackoverflow.com/questions/18136918/how-to-get-current-relative-di… @@ -17,23 +23,33 @@ clobber: env config: env ./config.sh $(DEV_ROOT) $(ARCH) -build: env - ./build.sh $(DEV_ROOT) $(ARCH) +geckoview: env + ./build-geckoview.sh $(DEV_ROOT) $(ARCH) -fataar: env - bash -c "source android-env.sh && ./fataar.py $(DEV_ROOT) $(ARCHS)" - -package: env - ./package-gradle.sh $(DEV_ROOT) $(ARCH) - -show: - ls -lh ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni/ - ls -lh ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni/$(shell ls ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni | tail -n 2 | head -n 1) +# These targets do not depend on GeckoView so that you can build only Fenix if +# you are not changing GV code. +fenix-release: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Release +fenix-beta: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Beta +fenix-nightly: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Nightly +fenix-debug: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Debug env: test -e android-env.sh || { echo "copy android-env-...-template.sh to android-env.sh and edit appropriatly"; exit 1; } -all: env build package +install-release: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-fenix-$(ANDROID_ARCH)-release-signed.apk" +install-beta: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/beta/app-fenix-$(ANDROID_ARCH)-beta-signed.apk" +install-nightly: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/nightly/app-fenix-$(ANDROID_ARCH)-nightly-signed.apk" + +all: env geckoview fenix-nightly install-nightly +all-release: env geckoview fenix-release install-release +all-beta: env geckoview fenix-beta install-beta jslint: ./jslint.sh $(DEV_ROOT) $(JS) ===================================== tools/geckoview/android-env-linux-template.sh ===================================== @@ -1,7 +1,6 @@ -export MOZ_BUILD_DATE=20230710165010 # This should match the data in [firefox-android](https://gitlab.torproject.org/tpo/applications/firefox-and… ~ln 12's def of the variable *version*, the date component export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 export ANDROID_HOME=$HOME/.mozbuild/android-sdk-linux/ # or $HOME/Android/Sdk/ # Or .../android-toolchain/android-sdk-linux if you extract android-toolchain from tor-browser-build -export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313/ # for 115esr -export GRADLE_HOME=/FULL/PATH/TO/tor-browser-build/out/gradle/gradle-7.5.1 # Or the version that we currently use +export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/r26c/ # for 128esr +export GRADLE_HOME=/FULL/PATH/TO/tor-browser-build/out/gradle/gradle-8.8 # Or the version that we currently use export LOCAL_DEV_BUILD=1 export PATH=/FULL/PATH/TO/tor-browser-build/out/clang/clang-16.x.y-arm/bin/:$PATH # prepend our newly built and assembled clang to the path so it gets used to build geckoview ===================================== tools/geckoview/android-env-macos-template.sh ===================================== @@ -1,4 +1,3 @@ -export MOZ_BUILD_DATE=20230710165010 # This should match the data in [firefox-android](https://gitlab.torproject.org/tpo/applications/firefox-and… ~ln 12's def of the variable *version*, the date component export JAVA_HOME=/opt/homebrew/opt/openjdk(a)11/libexec/openjdk.jdk/Contents/Home/ # for arm64. Or JAVA_HOME=/usr/local/opt/openjdk(a)11/libexec/openjdk.jdk/Contents/Home/ for x86_64. export ANDROID_HOME=$HOME/Library/Android/sdk # or $HOME/.mozbuild/android-sdk-macosx/ export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313 # will need to download NDK 23.2.8568313 via android studio ===================================== tools/geckoview/build-fenix.sh ===================================== @@ -0,0 +1,11 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 +ARCH=$2 +VARIANT=$3 + +source android-env.sh + +cd $DEV_ROOT/mobile/android/fenix +MOZCONFIG=mozconfig-android-$ARCH $GRADLE_HOME/bin/gradle --no-daemon -Dorg.gradle.jvmargs=-Xmx20g -PdisableOptimization assemble$VARIANT +tools/tba-sign-devbuilds.sh ===================================== tools/geckoview/build.sh → tools/geckoview/build-geckoview.sh ===================================== @@ -6,4 +6,4 @@ ARCH=$2 source android-env.sh cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach build +MOZCONFIG=mozconfig-android-$ARCH ./mach build ===================================== tools/geckoview/clobber.sh ===================================== @@ -7,4 +7,3 @@ source android-env.sh cd $DEV_ROOT MOZCONFIG=mozconfig-android-$ARCH ./mach clobber -MOZCONFIG=mozconfig-android-all ./mach clobber ===================================== tools/geckoview/config.sh ===================================== @@ -6,4 +6,4 @@ ARCH=$2 source android-env.sh cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries +MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries ===================================== tools/geckoview/fataar.py deleted ===================================== @@ -1,52 +0,0 @@ -#!/usr/bin/env python3 -import os -import re -import subprocess -import sys - -dev_root = sys.argv[1] -archs_in = re.split("\\s+|,", sys.argv[2]) if len(sys.argv) >= 3 else [] -archs_out = [] -env = dict(os.environ) - -env["MOZCONFIG"] = "mozconfig-android-all" -if "armv7" in archs_in: - env["MOZ_ANDROID_FAT_AAR_ARMEABI_V7A"] = ( - dev_root - + "/obj-arm-linux-androideabi/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("armeabi-v7a") -if "aarch64" in archs_in: - env["MOZ_ANDROID_FAT_AAR_ARM64_V8A"] = ( - dev_root - + "/obj-aarch64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("arm64-v8a") -if "x86" in archs_in or "i686" in archs_in: - env["MOZ_ANDROID_FAT_AAR_X86"] = ( - dev_root - + "/obj-i386-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("x86") -if "x86_64" in archs_in or "x86-64" in archs_in: - env["MOZ_ANDROID_FAT_AAR_X86_64"] = ( - dev_root - + "/obj-x86_64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("x86_64") -env["MOZ_ANDROID_FAT_AAR_ARCHITECTURES"] = ",".join(archs_out) - -if not archs_out: - print( - "The architectures have not specified or are not valid.", - file=sys.stderr, - ) - print('Usage: make fat-aar ARCHS="$archs"', file=sys.stderr) - print( - "Valid architectures are armv7 aarch64 x86 x86_64, and must be separated with a space.", - file=sys.stderr, - ) - sys.exit(1) - -subprocess.run(["./mach", "configure"], cwd=dev_root, env=env, check=True) -subprocess.run(["./mach", "build"], cwd=dev_root, env=env, check=True) ===================================== tools/geckoview/package-gradle.sh deleted ===================================== @@ -1,15 +0,0 @@ -#!/bin/bash -set -e -DEV_ROOT=$1 -ARCH=$2 - -source android-env.sh - -env ARCHS=$ARCH make fataar - -cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach build binaries -MOZCONFIG=mozconfig-android-$ARCH ./mach gradle geckoview:publishWithGeckoBinariesDebugPublicationToMavenRepository -MOZCONFIG=mozconfig-android-all ./mach gradle geckoview:publishWithGeckoBinariesDebugPublicationToMavenLocal exoplayer2:publishDebugPublicationToMavenLocal - - View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6756b7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6756b7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] fixup! Bug 40933: Add tor-launcher functionality
by Pier Angelo Vendrame (＠pierov) 02 Dec '24

02 Dec '24

Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 6756b736 by Pier Angelo Vendrame at 2024-12-02T18:33:34+01:00 fixup! Bug 40933: Add tor-launcher functionality Bug 43326: Restrict the changes to LD_LIBRARY_PATH. We used to set LD_LIBRARY_PATH for the tor daemon before launching the browser, but this does not work well for some distributions, which link to the latest version of OpenSSL, whereas we link to the LTS. To avoid conflicts, we can set a custom LD_LIBRARY_PATH only for the tor daemon. - - - - - 2 changed files: - toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs - toolkit/components/tor-launcher/TorProcess.sys.mjs Changes: ===================================== toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs ===================================== @@ -5,6 +5,8 @@ * Tor Launcher Util JS Module *************************************************************************/ +import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; + const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { @@ -335,6 +337,13 @@ export const TorLauncherUtil = Object.freeze({ return Services.appinfo.OS === "Android"; }, + get isLinux() { + // Use AppConstants for Linux rather then appinfo because we are sure it + // will catch also various Unix flavors for which unofficial ports might + // exist (which should work as Linux, as far as we know). + return AppConstants.platform === "linux"; + }, + get isMac() { return Services.appinfo.OS === "Darwin"; }, ===================================== toolkit/components/tor-launcher/TorProcess.sys.mjs ===================================== @@ -125,6 +125,16 @@ export class TorProcess { stderr: "stdout", workdir: lazy.TorLauncherUtil.getTorFile("pt-startup-dir", false).path, }; + if (lazy.TorLauncherUtil.isLinux) { + let ldLibPath = Services.env.get("LD_LIBRARY_PATH") ?? ""; + if (ldLibPath) { + ldLibPath = ":" + ldLibPath; + } + options.environment = { + LD_LIBRARY_PATH: this.#exeFile.parent.path + ldLibPath, + }; + options.environmentAppend = true; + } this.#subprocess = await Subprocess.call(options); this.#status = TorProcessStatus.Running; } catch (e) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6756b73… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6756b73… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41328: Exclude tor dependencies from LD_LIBRARY_PATH.
by Pier Angelo Vendrame (＠pierov) 02 Dec '24

02 Dec '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: b7c816f8 by Pier Angelo Vendrame at 2024-12-02T18:34:39+01:00 Bug 41328: Exclude tor dependencies from LD_LIBRARY_PATH. We discovered in tor-browser#43326 that adding our OpenSSL to LD_LIBRARY_PATH might cause the browser not to work in some distros. So, we decided to add them to LD_LIBRARY_PATH only for the tor daemon, instead. - - - - - 1 changed file: - projects/firefox/start-firefox Changes: ===================================== projects/firefox/start-firefox ===================================== @@ -17,9 +17,6 @@ add_LD_LIBRARY_PATH() { if [ $? -ne 0 ]; then add_LD_LIBRARY_PATH "$basedir/[% IF c("var/tor-browser") -%]TorBrowser/Tor/[% END -%]libstdc++/" fi -[% IF c("var/tor-browser") -%] -add_LD_LIBRARY_PATH "$basedir/TorBrowser/Tor/" -[% END -%] export LD_LIBRARY_PATH exec "$basedir/[% c("var/exe_name") %].real" "$@" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0