tor-browser

commit 27591d4a8b7f4fba0361733a9458b68f96e5dbcc
parent 6c59a371887abb1a0ae0891984875508870f0cb8
Author: Charlotte <69423184+tqpcharlie@users.noreply.github.com>
Date:   Tue,  6 Jan 2026 05:13:27 +0000

Bug 1585667 - Don't define MOZ_UPDATER on Android r=geckoview-reviewers,m_kato

Differential Revision: https://phabricator.services.mozilla.com/D277559

Diffstat:
M
mobile/android/app/geckoview-prefs.js
 | 
4
----
M
mobile/android/app/moz.build
 | 
2
+-
M
mobile/android/installer/package-manifest.in
 | 
5
+----
M
toolkit/modules/tests/xpcshell/xpcshell.toml
 | 
3
+++

4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/mobile/android/app/geckoview-prefs.js b/mobile/android/app/geckoview-prefs.js
@@ -17,10 +17,6 @@ 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_UPDATER", "MOZ_APP_UA_NAME", "TARGET_CPU"):
+for var in ("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 Fennec build.
+; Package file for the GeckoView build.
 ;
 ; File format:
 ;
@@ -17,9 +17,6 @@
 [@AB_CD@]
 @BINPATH@/@PREF_DIR@/mobile-l10n.js
 @BINPATH@/default.locale
-#ifdef MOZ_UPDATER
-@BINPATH@/updater.ini
-#endif
 @BINPATH@/hyphenation/*
 @BINPATH@/localization/*
 
diff --git a/toolkit/modules/tests/xpcshell/xpcshell.toml b/toolkit/modules/tests/xpcshell/xpcshell.toml
@@ -116,6 +116,9 @@ skip-if = [
 ["test_Services.js"]
 
 ["test_UpdateUtils_updatechannel.js"]
+skip-if = [
+  "os == 'android'",
+]
 
 ["test_UpdateUtils_url.js"]
 run-if = [