Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1804605 - Move MOZ_DATA_REPORTING to python configure. r=firefox-build-system-reviewers,nalexander

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D164185
This commit is contained in:
Mike Hommey 2022-12-12 21:43:52 +00:00
parent 97cebe501d
commit 9170271cd5
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
old-configure.in
View File

@ -1285,15 +1285,6 @@ AC_SUBST(MOZ_SOURCE_REPO)
AC_SUBST(MOZ_SOURCE_CHANGESET)
AC_SUBST(MOZ_INCLUDE_SOURCE_INFO)
dnl If we have any service that uploads data (and requires data submission
dnl policy alert), set MOZ_DATA_REPORTING.
dnl We need SUBST for build system and DEFINE for xul preprocessor.
if test -n "$MOZ_TELEMETRY_REPORTING" || test -n "$MOZ_SERVICES_HEALTHREPORT" || test -n "$MOZ_CRASHREPORTER" || test -n "$MOZ_NORMANDY"; then
MOZ_DATA_REPORTING=1
AC_DEFINE(MOZ_DATA_REPORTING)
AC_SUBST(MOZ_DATA_REPORTING)
fi
dnl win32 options
AC_SUBST(WIN32_REDIST_DIR)
AC_SUBST(WIN_UCRT_REDIST_DIR)

23
toolkit/moz.configure
View File

@ -926,14 +926,12 @@ project_flag("MOZ_PLACES", help="Build Places if required", set_as_define=True)
project_flag(
"MOZ_SERVICES_HEALTHREPORT",
help="Build Firefox Health Reporter Service",
set_for_old_configure=True,
set_as_define=True,
)
project_flag(
"MOZ_NORMANDY",
help="Enable Normandy recipe runner",
set_for_old_configure=True,
set_as_define=True,
)
@ -971,9 +969,6 @@ option(
)
set_define("MOZ_TELEMETRY_REPORTING", True, when="MOZ_TELEMETRY_REPORTING")
add_old_configure_assignment(
"MOZ_TELEMETRY_REPORTING", True, when="MOZ_TELEMETRY_REPORTING"
)
@depends("MOZ_TELEMETRY_REPORTING", milestone.is_nightly)
@ -2851,7 +2846,6 @@ option(
set_config("MOZ_CRASHREPORTER", True, when="--enable-crashreporter")
set_define("MOZ_CRASHREPORTER", True, when="--enable-crashreporter")
add_old_configure_assignment("MOZ_CRASHREPORTER", True, when="--enable-crashreporter")
with only_when(compile_environment):
with only_when("--enable-crashreporter"):
@ -2873,6 +2867,23 @@ with only_when(compile_environment):
)
# If we have any service that uploads data (and requires data submission
# policy alert), set MOZ_DATA_REPORTING.
# ==============================================================
@depends(
"MOZ_TELEMETRY_REPORTING",
"MOZ_SERVICES_HEALTHREPORT",
"--enable-crashreporter",
"MOZ_NORMANDY",
)
def data_reporting(telemetry, healthreport, crashreporter, normandy):
return telemetry or healthreport or crashreporter or normandy
set_config("MOZ_DATA_REPORTING", True, when=data_reporting)
set_define("MOZ_DATA_REPORTING", True, when=data_reporting)
# Gtk+
# ==============================================================
with only_when(toolkit_gtk):