[tbb-commits] [tor-browser] 05/06: fixup! Base Browser's .mozconfigs.

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch tor-browser-102.3.0esr-12.0-2
in repository tor-browser.

commit 7591a0780be46f561a05a86d4fb36b909497b9a7
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Mon Oct 3 12:56:46 2022 +0200

    fixup! Base Browser's .mozconfigs.
    
    Added Android mozconfigs.
---
 .../config/mozconfigs/base-browser-android         | 29 ++++++++++-------
 mozconfig-android-aarch64                          |  4 +++
 mozconfig-android-all-dev                          |  2 +-
 mozconfig-android-armv7                            | 37 ++--------------------
 mozconfig-android-x86                              |  4 +++
 mozconfig-android-x86_64                           |  4 +++
 6 files changed, 32 insertions(+), 48 deletions(-)

diff --git a/mozconfig-android-armv7 b/browser/config/mozconfigs/base-browser-android
similarity index 50%
copy from mozconfig-android-armv7
copy to browser/config/mozconfigs/base-browser-android
index 6ea51b0d5c05..5f882178828c 100644
--- a/mozconfig-android-armv7
+++ b/browser/config/mozconfigs/base-browser-android
@@ -1,26 +1,23 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi
-mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
 export MOZILLA_OFFICIAL=1
 
 ac_add_options --enable-optimize
 ac_add_options --enable-rust-simd
 ac_add_options --enable-official-branding
 
-# Android
 ac_add_options --enable-application=mobile/android
-ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="$NDK_BASE" #Enter the android ndk location(ndk r17b)
-ac_add_options --with-android-sdk="$SDK_BASE" #Enter the android sdk location
-ac_add_options --with-branding=mobile/android/branding/alpha
 
-# Use Mozilla's Clang blobs
-CC="$HOME/.mozbuild/clang/bin/clang"
-CXX="$HOME/.mozbuild/clang/bin/clang++"
+CC="clang"
+CXX="clang++"
+ac_add_options --with-java-bin-path=$JAVA_HOME/bin
+ac_add_options --with-android-sdk=$ANDROID_HOME
+ac_add_options --with-android-ndk=$ANDROID_NDK_HOME
+ac_add_options --with-android-min-sdk=21
 
-#enable ccache to set amount of cache assigned for build.
-ac_add_options --with-ccache
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568
+ac_add_options --enable-minify=properties
 
 ac_add_options --enable-strip
+ac_add_options --enable-install-strip
 ac_add_options --disable-tests
 ac_add_options --disable-debug
 ac_add_options --disable-rust-debug
@@ -33,5 +30,13 @@ ac_add_options --disable-parental-controls
 ac_add_options --enable-proxy-bypass-protection
 ac_add_options --disable-system-policies
 
+ac_add_options --enable-base-browser
+
 # Disable telemetry
 ac_add_options MOZ_TELEMETRY_REPORTING=
+
+if test ! -z "$LOCAL_DEV_BUILD"; then
+    ac_add_options --without-wasm-sandboxed-libraries
+    # You must use the "default" bogus channel for dev builds
+    ac_add_options --enable-update-channel=default
+fi
diff --git a/mozconfig-android-aarch64 b/mozconfig-android-aarch64
new file mode 100644
index 000000000000..5e166ec9ea8c
--- /dev/null
+++ b/mozconfig-android-aarch64
@@ -0,0 +1,4 @@
+. $topsrcdir/browser/config/mozconfigs/base-browser-android
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-aarch64-linux-android
+ac_add_options --target=aarch64-linux-android
diff --git a/mozconfig-android-all-dev b/mozconfig-android-all-dev
index 1d3d612eca97..8e2b5a05b5bf 100644
--- a/mozconfig-android-all-dev
+++ b/mozconfig-android-all-dev
@@ -13,4 +13,4 @@ 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
+ac_add_options --with-android-sdk=$ANDROID_HOME
diff --git a/mozconfig-android-armv7 b/mozconfig-android-armv7
index 6ea51b0d5c05..05468e50be53 100644
--- a/mozconfig-android-armv7
+++ b/mozconfig-android-armv7
@@ -1,37 +1,4 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi
-mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
-export MOZILLA_OFFICIAL=1
-
-ac_add_options --enable-optimize
-ac_add_options --enable-rust-simd
-ac_add_options --enable-official-branding
+. $topsrcdir/browser/config/mozconfigs/base-browser-android
 
-# Android
-ac_add_options --enable-application=mobile/android
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi
 ac_add_options --target=arm-linux-androideabi
-ac_add_options --with-android-ndk="$NDK_BASE" #Enter the android ndk location(ndk r17b)
-ac_add_options --with-android-sdk="$SDK_BASE" #Enter the android sdk location
-ac_add_options --with-branding=mobile/android/branding/alpha
-
-# Use Mozilla's Clang blobs
-CC="$HOME/.mozbuild/clang/bin/clang"
-CXX="$HOME/.mozbuild/clang/bin/clang++"
-
-#enable ccache to set amount of cache assigned for build.
-ac_add_options --with-ccache
-
-ac_add_options --enable-strip
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --disable-rust-debug
-
-ac_add_options --disable-updater
-ac_add_options --disable-crashreporter
-ac_add_options --disable-webrtc
-ac_add_options --disable-parental-controls
-
-ac_add_options --enable-proxy-bypass-protection
-ac_add_options --disable-system-policies
-
-# Disable telemetry
-ac_add_options MOZ_TELEMETRY_REPORTING=
diff --git a/mozconfig-android-x86 b/mozconfig-android-x86
new file mode 100644
index 000000000000..ed1c88cf396e
--- /dev/null
+++ b/mozconfig-android-x86
@@ -0,0 +1,4 @@
+. $topsrcdir/browser/config/mozconfigs/base-browser-android
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-i386-linux-android
+ac_add_options --target=i686-linux-android
diff --git a/mozconfig-android-x86_64 b/mozconfig-android-x86_64
new file mode 100644
index 000000000000..f8f6a301d4fb
--- /dev/null
+++ b/mozconfig-android-x86_64
@@ -0,0 +1,4 @@
+. $topsrcdir/browser/config/mozconfigs/base-browser-android
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-x86_64-linux-android
+ac_add_options --target=x86_64-linux-android

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.