Bug 1900206 - Move MOZ_APP_UA_NAME from confvars.sh to moz.configure r=glandium,geckoview-reviewers,m_kato

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

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_UA_NAME=Firefox
-
 MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh

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_UA_NAME", "Firefox")
 imply_option("MOZ_APP_VENDOR", "Mozilla")
 imply_option("MOZ_APP_ID", "{aa3c5121-dab2-40e2-81ca-7ea25febc110}")
 imply_option("BROWSER_CHROME_URL", "chrome://geckoview/content/geckoview.xhtml")

netwerk/protocol/http/moz.build

@@ -203,6 +203,8 @@ LOCAL_INCLUDES += [
     "/netwerk/url-classifier",
 ]
 
+DEFINES["MOZ_APP_UA_NAME"] = f'"{CONFIG["MOZ_APP_UA_NAME"]}"'
+
 if CONFIG["MOZ_AUTH_EXTENSION"]:
     LOCAL_INCLUDES += [
         "/extensions/auth",

old-configure.in

@@ -754,8 +754,6 @@ AC_SUBST(MOZ_APP_DISPLAYNAME)
 AC_SUBST(MOZ_APP_PROFILE)
 AC_SUBST(MAR_CHANNEL_ID)
 AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS)
-AC_DEFINE_UNQUOTED(MOZ_APP_UA_NAME, "$MOZ_APP_UA_NAME")
-AC_SUBST(MOZ_APP_UA_NAME)
 AC_DEFINE_UNQUOTED(MOZ_APP_UA_VERSION, "$MOZ_APP_VERSION")
 
 AC_SUBST(MOZ_APP_MAXVERSION)

toolkit/moz.configure

@@ -26,6 +26,13 @@ project_flag(
     help='used for application.ini\'s "Vendor" field, which also impacts profile location and user-visible fields',
 )
 
+project_flag(
+    env="MOZ_APP_UA_NAME",
+    default="",
+    nargs=1,
+    help="application name in the User Agent string",
+)
+
 project_flag(
     env="MOZ_DEVTOOLS",
     default="server",