brizental pushed to branch tor-browser-149.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 7bb908ff by Beatriz Rizental at 2026-04-01T14:19:31-03:00 fixup! TB 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 44359: Delete deprecated android build tools - - - - - 10 changed files: - − tools/geckoview/.gitignore - − 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-geckoview.sh - − tools/geckoview/clobber.sh - − tools/geckoview/config.sh - − tools/geckoview/install-fenix.sh - − tools/geckoview/jslint.sh Changes: ===================================== tools/geckoview/.gitignore deleted ===================================== @@ -1 +0,0 @@ -android-env.sh ===================================== tools/geckoview/Makefile deleted ===================================== @@ -1,60 +0,0 @@ -.DEFAULT_GOAL := all - -# one of armv7 aarch64 x86 x86_64 -ARCH := aarch64 -ANDROID_ARCH := $(ARCH) -ifeq ($(ANDROID_ARCH),aarch64) - ANDROID_ARCH := arm64-v8a -endif -ifeq ($(ANDROID_ARCH),armv7) - ANDROID_ARCH := armeabi-v7a -endif - -OS="${shell uname}" - -# https://stackoverflow.com/questions/18136918/how-to-get-current-relative-dir... -mkfile_path := "$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))" - -DEV_ROOT = "$(mkfile_path)/../.." - -clobber: env - ./clobber.sh $(DEV_ROOT) $(ARCH) - -config: env - ./config.sh $(DEV_ROOT) $(ARCH) - -geckoview: env - ./build-geckoview.sh $(DEV_ROOT) $(ARCH) - -# 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; } - -install-release: - ./install-fenix.sh $(DEV_ROOT) $(ARCH) $(ANDROID_ARCH) release -install-beta: - ./install-fenix.sh $(DEV_ROOT) $(ARCH) $(ANDROID_ARCH) beta -install-nightly: - ./install-fenix.sh $(DEV_ROOT) $(ARCH) $(ANDROID_ARCH) nightly -install-debug: - ./install-fenix.sh $(DEV_ROOT) $(ARCH) $(ANDROID_ARCH) debug - -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) - -clean: - rm -rf $(BUILD_OUTPUT) ===================================== tools/geckoview/android-env-linux-template.sh deleted ===================================== @@ -1,6 +0,0 @@ -export JAVA_HOME=/usr/lib/jvm/java-17-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=$HOME/.mozbuild/android-ndk-r28b/ # for 140esr -export GRADLE_HOME=$HOME/.mozbuild/gradle-8.14.3 # not included by default, need to download from https://gradle.org/releases/ and put the extracted directory "gradle-8.14.3" into ~/.mozbuild/ -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 deleted ===================================== @@ -1,6 +0,0 @@ -export JAVA_HOME=/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home # for arm64. Or JAVA_HOME=/usr/local/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home for x86_64. -export ANDROID_HOME=$HOME/.mozbuild/android-sdk-macosx -export ANDROID_NDK_HOME=$HOME/.mozbuild/android-ndk-r28b # for ESR140 -export GRADLE_HOME=$HOME/.mozbuild/gradle-8.14.3 # not included by default, need to download from https://gradle.org/releases/ and put the extracted directory "gradle-8.14.3" into ~/.mozbuild/ -export LOCAL_DEV_BUILD=1 -export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/bin:$PATH # prepend mozbuilds NDK to the PATH so it's clang gets used to build geckoview ===================================== tools/geckoview/build-fenix.sh deleted ===================================== @@ -1,13 +0,0 @@ -#!/bin/bash -set -e -DEV_ROOT=$1 -ARCH=$2 -VARIANT=$3 - -source android-env.sh - -cd $DEV_ROOT -OBJ_DIR=$(MOZCONFIG=mozconfig-android-$ARCH ./mach environment --format json --verbose | jq -r .topobjdir) -cd 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 "$OBJ_DIR" ===================================== tools/geckoview/build-geckoview.sh deleted ===================================== @@ -1,9 +0,0 @@ -#!/bin/bash -set -e -DEV_ROOT=$1 -ARCH=$2 - -source android-env.sh - -cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach build ===================================== tools/geckoview/clobber.sh deleted ===================================== @@ -1,9 +0,0 @@ -#!/bin/bash -set -e -DEV_ROOT=$1 -ARCH=$2 - -source android-env.sh - -cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach clobber ===================================== tools/geckoview/config.sh deleted ===================================== @@ -1,9 +0,0 @@ -#!/bin/bash -set -e -DEV_ROOT=$1 -ARCH=$2 - -source android-env.sh - -cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries ===================================== tools/geckoview/install-fenix.sh deleted ===================================== @@ -1,16 +0,0 @@ -#!/bin/bash -set -e -DEV_ROOT=$1 -ARCH=$2 -ANDROID_ARCH=$3 -VARIANT=$4 - -cd $DEV_ROOT -OBJ_DIR=$(MOZCONFIG=mozconfig-android-$ARCH ./mach environment --format json --verbose | jq -r .topobjdir) - -if [ $VARIANT == "debug" ] -then - adb install "$OBJ_DIR/gradle/build/mobile/android/fenix/app/outputs/apk/fenix/$VARIANT/app-fenix-$ANDROID_ARCH-$VARIANT.apk" -else - adb install "$OBJ_DIR/gradle/build/mobile/android/fenix/app/outputs/apk/fenix/$VARIANT/app-fenix-$ANDROID_ARCH-$VARIANT-signed.apk" -fi ===================================== tools/geckoview/jslint.sh deleted ===================================== @@ -1,9 +0,0 @@ -#!/bin/bash -set -e -DEV_ROOT=$1 -JS_FILE=$2 - -source android-env.sh - -cd $DEV_ROOT -./mach lint -l eslint --fix $JS_FILE View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7bb908ff... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7bb908ff... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help