Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1898060 - Move MOZ_APP_ID from old-configure to moz.configure r=glandium,geckoview-reviewers,m_kato

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D211099
This commit is contained in:
serge-sans-paille 2024-06-12 11:44:21 +00:00
parent a376744cbe
commit d8e03508f2
8 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/confvars.sh
View File

@ -35,7 +35,6 @@ BROWSER_CHROME_URL=chrome://browser/content/browser.xhtml
# For the mozilla-aurora repository, use "aurora".
MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
MOZ_PROFILE_MIGRATOR=1

3
browser/moz.configure
View File

@ -11,6 +11,9 @@ imply_option("MOZ_DEDICATED_PROFILES", True)
imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True)
imply_option("MOZ_NORMANDY", True)
imply_option("MOZ_APP_ID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}")
with only_when(target_has_linux_kernel & compile_environment):
option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper")

1
build/moz.configure/init.configure
View File

@ -1047,7 +1047,6 @@ set_config("MOZILLA_OFFICIAL", mozilla_official)
set_define("MOZILLA_OFFICIAL", mozilla_official)
add_old_configure_assignment("MOZILLA_OFFICIAL", mozilla_official)
# Allow specifying custom paths to the version files used by the milestone() function below.
option(
"--with-version-file-path",

2
mobile/android/confvars.sh
View File

@ -13,5 +13,3 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
# MOZ_APP_DISPLAYNAME is set by branding/configure.sh
MOZ_RAW=1
MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}

2
mobile/android/moz.configure
View File

@ -61,6 +61,8 @@ imply_option("MOZ_NORMANDY", False)
imply_option("MOZ_SERVICES_HEALTHREPORT", True)
imply_option("MOZ_GECKOVIEW_HISTORY", True)
imply_option("MOZ_APP_ID", "{aa3c5121-dab2-40e2-81ca-7ea25febc110}")
@depends(target)
def check_target(target):

3
old-configure.in
View File

@ -733,8 +733,6 @@ AC_SUBST(MOZ_EME_PROCESS_BUNDLEID)
# builds (e.g. Aurora for Firefox).
# - MOZ_APP_PROFILE: When set, used for application.ini's
# "Profile" field, which controls profile location.
# - MOZ_APP_ID: When set, used for application.ini's "ID" field, and
# crash reporter server url.
# - MOZ_PROFILE_MIGRATOR: When set, enables profile migrator.
# The following environment variables used to have an effect, but don't anymore:
@ -767,7 +765,6 @@ fi
AC_SUBST(MOZ_APP_DISPLAYNAME)
AC_SUBST(MOZ_APP_VENDOR)
AC_SUBST(MOZ_APP_PROFILE)
AC_SUBST(MOZ_APP_ID)
AC_SUBST(MAR_CHANNEL_ID)
AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS)
AC_SUBST(MOZ_PROFILE_MIGRATOR)

9
toolkit/moz.configure
View File

@ -4,6 +4,15 @@
# 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/.
# App-specific project settings
project_flag(
env="MOZ_APP_ID",
nargs=1,
help='used for application.ini\'s "ID" field, and crash reporter server url',
)
# Set the MOZ_CONFIGURE_OPTIONS variable with all the options that
# were passed somehow (environment, command line, mozconfig)

1
tools/update-programs/confvars.sh
View File

@ -6,7 +6,6 @@
MOZ_APP_VENDOR=Mozilla
MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
# Build the updater by default. Use --disable-updater to not.
MOZ_UPDATER=1