tor-browser

commit a4a14de2a139f8732e1b65ed2b718367fe731db8
parent 1b1b3f8151c160fedf1c68d0add8ffce60f0a871
Author: iulian moraru <imoraru@mozilla.com>
Date:   Sun, 28 Dec 2025 11:32:10 +0200

Revert "Bug 1585667 - Don't define MOZ_UPDATER on Android r=geckoview-reviewers,m_kato" for causing android xpcshell failures on test_UpdateUtils_updatechannel.js.

This reverts commit 1b1b3f8151c160fedf1c68d0add8ffce60f0a871.

Diffstat:
M
mobile/android/app/geckoview-prefs.js
 | 
4
++++
M
mobile/android/app/moz.build
 | 
2
+-
M
mobile/android/installer/package-manifest.in
 | 
5
++++-

3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/mobile/android/app/geckoview-prefs.js b/mobile/android/app/geckoview-prefs.js
@@ -17,6 +17,10 @@ pref("accessibility.typeaheadfind.timeout", 5000);
 
 pref("app.support.baseURL", "https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/");
 
+#ifdef MOZ_UPDATER
+  pref("app.update.channel", "@MOZ_UPDATE_CHANNEL@");
+#endif
+
 // Prefs used by UpdateTimerManager (including blocklist pings) (bug 783909)
 pref("app.update.timerFirstInterval", 30000); // milliseconds
 pref("app.update.timerMinimumDelay", 30); // seconds
diff --git a/mobile/android/app/moz.build b/mobile/android/app/moz.build
@@ -10,7 +10,7 @@ with Files("**"):
 for var in ("APP_NAME", "APP_VERSION"):
     DEFINES[var] = CONFIG["MOZ_%s" % var]
 
-for var in ("MOZ_APP_UA_NAME", "TARGET_CPU"):
+for var in ("MOZ_UPDATER", "MOZ_APP_UA_NAME", "TARGET_CPU"):
     DEFINES[var] = CONFIG[var]
 
 if CONFIG["MOZ_PKG_SPECIAL"]:
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
@@ -2,7 +2,7 @@
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-; Package file for the GeckoView build.
+; Package file for the Fennec build.
 ;
 ; File format:
 ;
@@ -17,6 +17,9 @@
 [@AB_CD@]
 @BINPATH@/@PREF_DIR@/mobile-l10n.js
 @BINPATH@/default.locale
+#ifdef MOZ_UPDATER
+@BINPATH@/updater.ini
+#endif
 @BINPATH@/hyphenation/*
 @BINPATH@/localization/*