Bug 41308: Use the same branch for Desktop and GeckoView

Fixes #41308 (closed).

assigned to @pierov

requested review from @boklm

/cc @richard

Notice that I compile GeckoView after defining these variables:

# Get it from android-components/buildSrc/src/main/java/Gecko.kt
# This is for Firefox 99.0b3
#export MOZ_BUILD_DATE=20220315185755
# This is for Firefox 102
export MOZ_BUILD_DATE=20220705093820

TOOLCHAINS="$HOME/Tor/toolchains"
export GRADLE_HOME="$TOOLCHAINS/gradle-7.3/"
export PATH=/usr/lib/jvm/java-1.11.0-openjdk-amd64/bin/:$PATH
export PATH="$TOOLCHAINS/clang-14.0.4/bin":"$TOOLCHAINS/cbindgen-0.23.0":"$GRADLE_HOME/bin":$PATH

export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
export ANDROID_HOME=/home/piero/Tor/android-toolchain/android-sdk-linux
export ANDROID_NDK_HOME=/home/piero/Tor/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d

export LOCAL_DEV_BUILD=1

added 3 commits

• 8d97d4e2 - fixup! Bug 40925: Implemented the Security Level component
• 099b62cb - fixup! Base Browser's .mozconfigs.
• 5558ec95 - fixup! TB3: Tor Browser's official .mozconfigs.

Compare with previous version

marked this merge request as draft from pierov/tor-browser@8d97d4e2

mentioned in issue tor-browser-build#23656 (closed)

marked this merge request as ready

mentioned in merge request tor-browser-build!524 (merged)

mentioned in issue #41000 (closed)

The added patches look good to me. I also looked at a diff between this MR and the geckoview branch, and didn't notice anything missing.

added 7 commits

• bdbc2156 - 1 commit from branch tpo/applications:tor-browser-102.3.0esr-12.0-2
• 6658c000 - fixup! Bug 30605: Honor privacy.spoof_english in Android
• 09a42b2b - fixup! Bug 40925: Implemented the Security Level component
• 515f44ce - fixup! Bug 9173: Change the default Firefox profile directory to be relative.
• 28020af1 - fixup! Bug 40925: Implemented the Security Level component
• 7591a078 - fixup! Base Browser's .mozconfigs.
• fdc9a5d0 - fixup! TB3: Tor Browser's official .mozconfigs.

Compare with previous version

marked this merge request as draft from pierov/tor-browser@6658c000

marked this merge request as ready

merged