This is an automated email from the git hooks/post-receive script.
pierov pushed a change to branch geckoview-102.2.0esr-12.0-1 in repository tor-browser.
from b2c2c5f22bc0 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser new 641bbefd93db fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser new e7e60d23b95f fixup! TB3: Tor Browser's official .mozconfigs.
The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: mozconfig-android-all-dev | 16 ++++++++++++++++ tools/torbrowser/Makefile | 3 +++ tools/torbrowser/fataar.sh | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 mozconfig-android-all-dev create mode 100755 tools/torbrowser/fataar.sh
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch geckoview-102.2.0esr-12.0-1 in repository tor-browser.
commit 641bbefd93dbc3623170f952b2a183fa6d77ca8a Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Tue Sep 20 10:20:08 2022 +0200
fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
Bug 41304: Add Android-specific targets to makefiles
Added a fat-aar target to the Makefile. --- tools/torbrowser/Makefile | 3 +++ tools/torbrowser/fataar.sh | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+)
diff --git a/tools/torbrowser/Makefile b/tools/torbrowser/Makefile index 92650151560e..be6f44c52ce6 100644 --- a/tools/torbrowser/Makefile +++ b/tools/torbrowser/Makefile @@ -28,6 +28,9 @@ build: deploy: ./deploy.sh $(BINARIES) $(BUILD_OUTPUT)
+fat-aar: + ./fataar.sh $(DEV_ROOT) $(ARCHS) + all: build deploy
run: diff --git a/tools/torbrowser/fataar.sh b/tools/torbrowser/fataar.sh new file mode 100755 index 000000000000..0f15a16e9cd9 --- /dev/null +++ b/tools/torbrowser/fataar.sh @@ -0,0 +1,34 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 +ARCHS=$2 + +cd $DEV_ROOT + +glue="" +if [[ "$ARCHS" == *"armv7"* ]]; then + export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$DEV_ROOT/obj-arm-linux-androideabi/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar + glue="$glue,armeabi-v7a" +fi +if [[ "$ARCHS" == *"aarch64"* ]]; then + export MOZ_ANDROID_FAT_AAR_ARM64_V8A=$DEV_ROOT/obj-aarch64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar + glue="$glue,arm64-v8a" +fi +if [[ "$ARCHS" == *"x86"* ]]; then + export MOZ_ANDROID_FAT_AAR_X86=$DEV_ROOT/obj-i386-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar + glue="$glue,x86" +fi +if [[ "$ARCHS" == *"x86_64"* ]]; then + export MOZ_ANDROID_FAT_AAR_X86_64=$DEV_ROOT/obj-x86_64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar + glue="$glue,x86_64" +fi +if [ -z "$glue" ]; then + echo "The architectures have not specified or are not valid." + echo "Usage: make fat-aar ARCHS="$archs"" + echo "Valid architectures are armv7 aarch64 x86 x86_64, and must be separated with a space." + exit 1 +fi +export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=${glue:1} + +MOZCONFIG=mozconfig-android-all-dev ./mach configure +MOZCONFIG=mozconfig-android-all-dev ./mach build
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch geckoview-102.2.0esr-12.0-1 in repository tor-browser.
commit e7e60d23b95fe2affe018858c9f39bb02c87f8be Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Tue Sep 20 10:23:46 2022 +0200
fixup! TB3: Tor Browser's official .mozconfigs.
Bug 41304: Add a mozconfig to build fat AARs --- mozconfig-android-all-dev | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
diff --git a/mozconfig-android-all-dev b/mozconfig-android-all-dev new file mode 100644 index 000000000000..1d3d612eca97 --- /dev/null +++ b/mozconfig-android-all-dev @@ -0,0 +1,16 @@ +export MOZILLA_OFFICIAL=1 + +ac_add_options --enable-application=mobile/android +ac_add_options --disable-compile-environment + +# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568 +ac_add_options --enable-minify=properties + +# You must use the "default" bogus channel for dev builds +ac_add_options --enable-update-channel=default + +ac_add_options --without-wasm-sandboxed-libraries +ac_add_options --with-tor-browser-version=dev-build + +ac_add_options --with-java-bin-path=/usr/lib/jvm/java-11-openjdk-amd64/bin +ac_add_options --with-android-sdk=$HOME/Android/Sdk
tor-commits@lists.torproject.org
-
gitolite role