clairehurst pushed to branch tor-browser-140.1.0esr-15.0-1 at The Tor Project / Applications / Tor Browser

Commits:

4 changed files:

Changes:

  • tools/geckoview/Makefile
    ... ... @@ -41,11 +41,13 @@ env:
    41 41 
     	test -e android-env.sh || { echo "copy android-env-...-template.sh to android-env.sh and edit appropriatly"; exit 1; }
    42 42
    43 43 
     install-release:
    44 
    -	./install-fenix.sh $(DEV_ROOT) $(ANDROID_ARCH) release
    44 
    +	./install-fenix.sh $(DEV_ROOT) $(ARCH) $(ANDROID_ARCH) release
    45 45 
     install-beta:
    46 
    -	./install-fenix.sh $(DEV_ROOT) $(ANDROID_ARCH) beta
    46 
    +	./install-fenix.sh $(DEV_ROOT) $(ARCH) $(ANDROID_ARCH) beta
    47 47 
     install-nightly:
    48 
    -	./install-fenix.sh $(DEV_ROOT) $(ANDROID_ARCH) nightly
    48 
    +	./install-fenix.sh $(DEV_ROOT) $(ARCH) $(ANDROID_ARCH) nightly
    49 
    +install-debug:
    50 
    +	./install-fenix.sh $(DEV_ROOT) $(ARCH) $(ANDROID_ARCH) debug
    49 51
    50 52 
     all: env geckoview fenix-nightly install-nightly
    51 53 
     all-release: env geckoview fenix-release install-release
    ... ... @@ -56,4 +58,3 @@ jslint:
    56 58
    57 59 
     clean:
    58 60 
     	rm -rf $(BUILD_OUTPUT)
    59 
    -

  • tools/geckoview/android-env-linux-template.sh
    1 
    -export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
    1 
    +export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
    2 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=$ANDROID_HOME/ndk/r26c/ # for 128esr
    4 
    -export GRADLE_HOME=/FULL/PATH/TO/tor-browser-build/out/gradle/gradle-8.8 # Or the version that we currently use
    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 5 
     export LOCAL_DEV_BUILD=1
    6 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
    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/Library/Android/sdk # or $HOME/.mozbuild/android-sdk-macosx/
    3 
    -export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/26.2.11394342 # will need to download the relevant NDK via android studio (e.g. 26.2.11394342)
    4 
    -GRADLE_DIR=/opt/homebrew/Cellar/gradle # for arm64, or /usr/local/Cellar/gradle for x86_64. Download via homebrew.
    5 
    -GRADLE_VERSION=`ls -1 "$GRADLE_DIR" | sort -hr | head -n 1` # Finds the latest gradle version in the specified GRADLE_DIR
    6 
    -export GRADLE_HOME=$GRADLE_DIR/$GRADLE_VERSION
    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/
    7 5 
     export LOCAL_DEV_BUILD=1
    8 
    -export PATH=$ANDROID_HOME/ndk/26.2.11394342/toolchains/llvm/prebuilt/darwin-x86_64/bin/:$PATH # prepend android studios latest ndk to the path so it's clang gets used to build geckoview. Note that it doesn't need to be the same version as above
    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/install-fenix.sh
    1 1 
     #!/bin/bash
    2 2 
     set -e
    3 3 
     DEV_ROOT=$1
    4 
    -ANDROID_ARCH=$2
    5 
    -VARIANT=$3
    4 
    +ARCH=$2
    5 
    +ANDROID_ARCH=$3
    6 
    +VARIANT=$4
    6 7
    7 8 
     cd $DEV_ROOT
    8 9 
     OBJ_DIR=$(MOZCONFIG=mozconfig-android-$ARCH ./mach environment --format json --verbose | jq -r .topobjdir)
    9 
    -adb install "$OBJ_DIR/gradle/build/mobile/android/fenix/app/outputs/apk/fenix/$VARIANT/app-fenix-$ANDROID_ARCH-nightly-signed.apk"
    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

    • —
    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/a672bc1c2c68126bff8cd6aa918a305c777e1ec9 at 1753304555