[tbb-commits] [tor-browser] 01/03: 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 800f5d762fa263fa1f4356305e3b6cf78251a907
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Mon Oct 10 17:33:28 2022 +0200

    fixup! Base Browser's .mozconfigs.
    
    Bug 23656: Updated Android mozconfigs to be used with tor-browser-build.
---
 browser/config/mozconfigs/base-browser-android |  4 ++++
 mozconfig-android-all                          | 23 +++++++++++++++++++++++
 mozconfig-android-all-dev                      | 16 ----------------
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/browser/config/mozconfigs/base-browser-android b/browser/config/mozconfigs/base-browser-android
index 5f882178828c..744485d846f6 100644
--- a/browser/config/mozconfigs/base-browser-android
+++ b/browser/config/mozconfigs/base-browser-android
@@ -12,6 +12,7 @@ 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
+ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle
 
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1758568
 ac_add_options --enable-minify=properties
@@ -39,4 +40,7 @@ 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
+else
+    # We only use beta GeckoView for now, for official builds
+    ac_add_options --enable-update-channel=beta
 fi
diff --git a/mozconfig-android-all b/mozconfig-android-all
new file mode 100644
index 000000000000..24ce81ac88da
--- /dev/null
+++ b/mozconfig-android-all
@@ -0,0 +1,23 @@
+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
+
+if test -n "$LOCAL_DEV_BUILD"; then
+    # You must use the "default" bogus channel for dev builds
+    ac_add_options --enable-update-channel=default
+    ac_add_options --without-wasm-sandboxed-libraries
+else
+    # We want to have a similar fat .aar versioning as Mozilla and make it clear
+    # we are on the beta channel for GeckoView
+    ac_add_options --enable-update-channel=beta
+fi
+
+ac_add_options --with-tor-browser-version=dev-build
+
+ac_add_options --with-java-bin-path=$JAVA_HOME/bin
+ac_add_options --with-android-sdk=$ANDROID_HOME
+ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle
diff --git a/mozconfig-android-all-dev b/mozconfig-android-all-dev
deleted file mode 100644
index 8e2b5a05b5bf..000000000000
--- a/mozconfig-android-all-dev
+++ /dev/null
@@ -1,16 +0,0 @@
-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=$ANDROID_HOME

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