From 871d25f61ec02b2059ef49730d99ea1b5e251067 Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@mozilla.com>
Date: Tue, 11 Jun 2024 16:30:58 +0000
Subject: [PATCH] Bug 1898177 - Move MOZ_APP_VENDOR from confvars.sh to
 moz.configure r=glandium,geckoview-reviewers,m_kato

Differential Revision: https://phabricator.services.mozilla.com/D212338
---
 browser/confvars.sh               | 2 --
 browser/moz.configure             | 1 +
 mobile/android/confvars.sh        | 2 --
 mobile/android/moz.configure      | 1 +
 old-configure.in                  | 3 ---
 toolkit/moz.configure             | 6 ++++++
 tools/update-programs/confvars.sh | 2 --
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/browser/confvars.sh b/browser/confvars.sh
index faf107d3d62c..786fb417cba7 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -3,8 +3,6 @@
 # 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/.
 
-MOZ_APP_VENDOR=Mozilla
-
 if test "$OS_ARCH" = "WINNT"; then
   if ! test "$HAVE_64BIT_BUILD"; then
     if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \
diff --git a/browser/moz.configure b/browser/moz.configure
index aa4affef82e3..069bdec2cfde 100644
--- a/browser/moz.configure
+++ b/browser/moz.configure
@@ -12,6 +12,7 @@ imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True)
 imply_option("MOZ_NORMANDY", True)
 
 
+imply_option("MOZ_APP_VENDOR", "Mozilla")
 imply_option("MOZ_APP_ID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}")
 
 with only_when(target_has_linux_kernel & compile_environment):
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index 56482ef7dc65..7b9adf55cd01 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -2,8 +2,6 @@
 # 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/.
 
-MOZ_APP_VENDOR=Mozilla
-
 MOZ_APP_UA_NAME=Firefox
 
 BROWSER_CHROME_URL=chrome://geckoview/content/geckoview.xhtml
diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure
index f08a66d8f81f..5ed8c5070414 100644
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -61,6 +61,7 @@ imply_option("MOZ_NORMANDY", False)
 imply_option("MOZ_SERVICES_HEALTHREPORT", True)
 imply_option("MOZ_GECKOVIEW_HISTORY", True)
 
+imply_option("MOZ_APP_VENDOR", "Mozilla")
 imply_option("MOZ_APP_ID", "{aa3c5121-dab2-40e2-81ca-7ea25febc110}")
 
 
diff --git a/old-configure.in b/old-configure.in
index 38f34ba6abe9..b3d14b23d0f2 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -726,8 +726,6 @@ AC_SUBST(MOZ_EME_PROCESS_BUNDLEID)
 
 # The following variables are available to branding and application
 # configuration ($BRANDING/configure.sh and $APPLICATION/confvars.sh):
-# - MOZ_APP_VENDOR: Used for application.ini's "Vendor" field, which also
-# impacts profile location and user-visible fields.
 # - MOZ_APP_DISPLAYNAME: Used in user-visible fields (DLL properties,
 # Mac Bundle name, Updater, Installer), it is typically used for nightly
 # builds (e.g. Aurora for Firefox).
@@ -763,7 +761,6 @@ else
 fi
 
 AC_SUBST(MOZ_APP_DISPLAYNAME)
-AC_SUBST(MOZ_APP_VENDOR)
 AC_SUBST(MOZ_APP_PROFILE)
 AC_SUBST(MAR_CHANNEL_ID)
 AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS)
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 2f4568dbfd38..9f0a87566874 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -13,6 +13,12 @@ project_flag(
     help='used for application.ini\'s "ID" field, and crash reporter server url',
 )
 
+project_flag(
+    env="MOZ_APP_VENDOR",
+    nargs=1,
+    help='used for application.ini\'s "Vendor" field, which also impacts profile location and user-visible fields',
+)
+
 
 # Set the MOZ_CONFIGURE_OPTIONS variable with all the options that
 # were passed somehow (environment, command line, mozconfig)
diff --git a/tools/update-programs/confvars.sh b/tools/update-programs/confvars.sh
index 96834f590bd9..d45901b4c5e9 100644
--- a/tools/update-programs/confvars.sh
+++ b/tools/update-programs/confvars.sh
@@ -3,8 +3,6 @@
 # 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/.
 
-MOZ_APP_VENDOR=Mozilla
-
 MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
 
 # Build the updater by default.  Use --disable-updater to not.