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

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-149.0a1-16.0-2] fixup! TB 41089: Add tor-browser build scripts + Makefile to tor-browser

Title: GitLab

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:

Changes:

  • tools/geckoview/.gitignore deleted
    1 
    -android-env.sh

  • tools/geckoview/Makefile deleted
    1 
    -.DEFAULT_GOAL := all
    2 
    -
    3 
    -# one of armv7 aarch64 x86 x86_64
    4 
    -ARCH := aarch64
    5 
    -ANDROID_ARCH := $(ARCH)
    6 
    -ifeq ($(ANDROID_ARCH),aarch64)
    7 
    -  ANDROID_ARCH := arm64-v8a
    8 
    -endif
    9 
    -ifeq ($(ANDROID_ARCH),armv7)
    10 
    -  ANDROID_ARCH := armeabi-v7a
    11 
    -endif
    12 
    -
    13 
    -OS="${shell uname}"
    14 
    -
    15 
    -# https://stackoverflow.com/questions/18136918/how-to-get-current-relative-directory-of-your-makefile
    16 
    -mkfile_path := "$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))"
    17 
    -
    18 
    -DEV_ROOT = "$(mkfile_path)/../.."
    19 
    -
    20 
    -clobber: env
    21 
    -	./clobber.sh $(DEV_ROOT) $(ARCH)
    22 
    -
    23 
    -config: env
    24 
    -	./config.sh $(DEV_ROOT) $(ARCH)
    25 
    -
    26 
    -geckoview: env
    27 
    -	./build-geckoview.sh $(DEV_ROOT) $(ARCH)
    28 
    -
    29 
    -# These targets do not depend on GeckoView so that you can build only Fenix if
    30 
    -# you are not changing GV code.
    31 
    -fenix-release: env
    32 
    -	./build-fenix.sh $(DEV_ROOT) $(ARCH) Release
    33 
    -fenix-beta: env
    34 
    -	./build-fenix.sh $(DEV_ROOT) $(ARCH) Beta
    35 
    -fenix-nightly: env
    36 
    -	./build-fenix.sh $(DEV_ROOT) $(ARCH) Nightly
    37 
    -fenix-debug: env
    38 
    -	./build-fenix.sh $(DEV_ROOT) $(ARCH) Debug
    39 
    -
    40 
    -env:
    41 
    -	test -e android-env.sh || { echo "copy android-env-...-template.sh to android-env.sh and edit appropriatly"; exit 1; }
    42 
    -
    43 
    -install-release:
    44 
    -	./install-fenix.sh $(DEV_ROOT) $(ARCH) $(ANDROID_ARCH) release
    45 
    -install-beta:
    46 
    -	./install-fenix.sh $(DEV_ROOT) $(ARCH) $(ANDROID_ARCH) beta
    47 
    -install-nightly:
    48 
    -	./install-fenix.sh $(DEV_ROOT) $(ARCH) $(ANDROID_ARCH) nightly
    49 
    -install-debug:
    50 
    -	./install-fenix.sh $(DEV_ROOT) $(ARCH) $(ANDROID_ARCH) debug
    51 
    -
    52 
    -all: env geckoview fenix-nightly install-nightly
    53 
    -all-release: env geckoview fenix-release install-release
    54 
    -all-beta: env geckoview fenix-beta install-beta
    55 
    -
    56 
    -jslint:
    57 
    -	./jslint.sh $(DEV_ROOT) $(JS)
    58 
    -
    59 
    -clean:
    60 
    -	rm -rf $(BUILD_OUTPUT)

  • tools/geckoview/android-env-linux-template.sh deleted
    1 
    -export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
    2 
    -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
    3 
    -export ANDROID_NDK_HOME=$HOME/.mozbuild/android-ndk-r28b/ # for 140esr
    4 
    -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/
    5 
    -export LOCAL_DEV_BUILD=1
    6 
    -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 
    -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.
    2 
    -export ANDROID_HOME=$HOME/.mozbuild/android-sdk-macosx
    3 
    -export ANDROID_NDK_HOME=$HOME/.mozbuild/android-ndk-r28b # for ESR140
    4 
    -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/
    5 
    -export LOCAL_DEV_BUILD=1
    6 
    -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 
    -#!/bin/bash
    2 
    -set -e
    3 
    -DEV_ROOT=$1
    4 
    -ARCH=$2
    5 
    -VARIANT=$3
    6 
    -
    7 
    -source android-env.sh
    8 
    -
    9 
    -cd $DEV_ROOT
    10 
    -OBJ_DIR=$(MOZCONFIG=mozconfig-android-$ARCH ./mach environment --format json --verbose | jq -r .topobjdir)
    11 
    -cd mobile/android/fenix
    12 
    -MOZCONFIG=mozconfig-android-$ARCH $GRADLE_HOME/bin/gradle --no-daemon -Dorg.gradle.jvmargs=-Xmx20g -PdisableOptimization assemble$VARIANT
    13 
    -tools/tba-sign-devbuilds.sh "$OBJ_DIR"

  • tools/geckoview/build-geckoview.sh deleted
    1 
    -#!/bin/bash
    2 
    -set -e
    3 
    -DEV_ROOT=$1
    4 
    -ARCH=$2
    5 
    -
    6 
    -source android-env.sh
    7 
    -
    8 
    -cd $DEV_ROOT
    9 
    -MOZCONFIG=mozconfig-android-$ARCH ./mach build

  • tools/geckoview/clobber.sh deleted
    1 
    -#!/bin/bash
    2 
    -set -e
    3 
    -DEV_ROOT=$1
    4 
    -ARCH=$2
    5 
    -
    6 
    -source android-env.sh
    7 
    -
    8 
    -cd $DEV_ROOT
    9 
    -MOZCONFIG=mozconfig-android-$ARCH ./mach clobber

  • tools/geckoview/config.sh deleted
    1 
    -#!/bin/bash
    2 
    -set -e
    3 
    -DEV_ROOT=$1
    4 
    -ARCH=$2
    5 
    -
    6 
    -source android-env.sh
    7 
    -
    8 
    -cd $DEV_ROOT
    9 
    -MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries

  • tools/geckoview/install-fenix.sh deleted
    1 
    -#!/bin/bash
    2 
    -set -e
    3 
    -DEV_ROOT=$1
    4 
    -ARCH=$2
    5 
    -ANDROID_ARCH=$3
    6 
    -VARIANT=$4
    7 
    -
    8 
    -cd $DEV_ROOT
    9 
    -OBJ_DIR=$(MOZCONFIG=mozconfig-android-$ARCH ./mach environment --format json --verbose | jq -r .topobjdir)
    10 
    -
    11 
    -if [ $VARIANT == "debug" ]
    12 
    -then
    13 
    -  adb install "$OBJ_DIR/gradle/build/mobile/android/fenix/app/outputs/apk/fenix/$VARIANT/app-fenix-$ANDROID_ARCH-$VARIANT.apk"
    14 
    -else
    15 
    -  adb install "$OBJ_DIR/gradle/build/mobile/android/fenix/app/outputs/apk/fenix/$VARIANT/app-fenix-$ANDROID_ARCH-$VARIANT-signed.apk"
    16 
    -fi

  • tools/geckoview/jslint.sh deleted
    1 
    -#!/bin/bash
    2 
    -set -e
    3 
    -DEV_ROOT=$1
    4 
    -JS_FILE=$2
    5 
    -
    6 
    -source android-env.sh
    7 
    -
    8 
    -cd $DEV_ROOT
    9 
    -./mach lint -l eslint --fix $JS_FILE

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7bb908ffc9d26be62e7520b4a1de30ad4a81b1a2 at 1775072388 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx