зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1796085 - Part 1: Define MOZ_BACKGROUNDTASKS macro globally r=smaug,necko-reviewers,application-update-reviewers,nalexander,valentin
There are 10+ separate macro definition for this, we can do it globally instead. Differential Revision: https://phabricator.services.mozilla.com/D156911
This commit is contained in:
Родитель
26dad90e64
Коммит
fac20df060
|
@ -102,10 +102,6 @@ ifdef MOZ_NOTIFICATION_SERVER
|
||||||
DEFINES += -DMOZ_NOTIFICATION_SERVER=1
|
DEFINES += -DMOZ_NOTIFICATION_SERVER=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef MOZ_BACKGROUNDTASKS
|
|
||||||
DEFINES += -DMOZ_BACKGROUNDTASKS=1
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||||
MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore
|
MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore
|
||||||
MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png
|
MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png
|
||||||
|
|
|
@ -48,9 +48,6 @@ for cdm in CONFIG["MOZ_EME_MODULES"]:
|
||||||
if CONFIG["MOZ_GPSD"]:
|
if CONFIG["MOZ_GPSD"]:
|
||||||
DEFINES["MOZ_GPSD"] = True
|
DEFINES["MOZ_GPSD"] = True
|
||||||
|
|
||||||
if CONFIG["MOZ_BACKGROUNDTASKS"]:
|
|
||||||
DEFINES["MOZ_BACKGROUNDTASKS"] = True
|
|
||||||
|
|
||||||
if CONFIG["MOZ_UPDATE_AGENT"]:
|
if CONFIG["MOZ_UPDATE_AGENT"]:
|
||||||
DEFINES["MOZ_UPDATE_AGENT"] = True
|
DEFINES["MOZ_UPDATE_AGENT"] = True
|
||||||
|
|
||||||
|
|
|
@ -175,7 +175,4 @@ else:
|
||||||
"greprefs.js",
|
"greprefs.js",
|
||||||
]
|
]
|
||||||
|
|
||||||
if CONFIG["MOZ_BACKGROUNDTASKS"]:
|
|
||||||
DEFINES["MOZ_BACKGROUNDTASKS"] = True
|
|
||||||
|
|
||||||
REQUIRES_UNIFIED_BUILD = True
|
REQUIRES_UNIFIED_BUILD = True
|
||||||
|
|
|
@ -68,4 +68,3 @@ if CONFIG["MOZ_BACKGROUNDTASKS"]:
|
||||||
EXTRA_JS_MODULES.backgroundtasks += [
|
EXTRA_JS_MODULES.backgroundtasks += [
|
||||||
"BackgroundTask_purgeHTTPCache.sys.mjs",
|
"BackgroundTask_purgeHTTPCache.sys.mjs",
|
||||||
]
|
]
|
||||||
DEFINES["MOZ_BACKGROUNDTASKS"] = True
|
|
||||||
|
|
|
@ -31,9 +31,6 @@ XPIDL_SOURCES += [
|
||||||
"nsIStartupCacheInfo.idl",
|
"nsIStartupCacheInfo.idl",
|
||||||
]
|
]
|
||||||
|
|
||||||
if CONFIG["MOZ_BACKGROUNDTASKS"]:
|
|
||||||
DEFINES["MOZ_BACKGROUNDTASKS"] = True
|
|
||||||
|
|
||||||
FINAL_LIBRARY = "xul"
|
FINAL_LIBRARY = "xul"
|
||||||
|
|
||||||
REQUIRES_UNIFIED_BUILD = True
|
REQUIRES_UNIFIED_BUILD = True
|
||||||
|
|
|
@ -19,10 +19,6 @@ if CONFIG["COMPILE_ENVIRONMENT"]:
|
||||||
|
|
||||||
DEFINES["MOZ_APP_VERSION"] = '"%s"' % CONFIG["MOZ_APP_VERSION"]
|
DEFINES["MOZ_APP_VERSION"] = '"%s"' % CONFIG["MOZ_APP_VERSION"]
|
||||||
|
|
||||||
for var in ("MOZ_BACKGROUNDTASKS",):
|
|
||||||
if CONFIG[var]:
|
|
||||||
DEFINES[var] = True
|
|
||||||
|
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
"/xpcom/build",
|
"/xpcom/build",
|
||||||
"/xpcom/threads",
|
"/xpcom/threads",
|
||||||
|
|
|
@ -286,7 +286,6 @@ for var in (
|
||||||
|
|
||||||
for var in (
|
for var in (
|
||||||
"MOZ_ALLOW_ADDON_SIDELOAD",
|
"MOZ_ALLOW_ADDON_SIDELOAD",
|
||||||
"MOZ_BACKGROUNDTASKS",
|
|
||||||
"MOZ_SYSTEM_NSS",
|
"MOZ_SYSTEM_NSS",
|
||||||
"MOZ_SYSTEM_POLICIES",
|
"MOZ_SYSTEM_POLICIES",
|
||||||
"MOZ_UNSIGNED_APP_SCOPE",
|
"MOZ_UNSIGNED_APP_SCOPE",
|
||||||
|
|
|
@ -2656,9 +2656,13 @@ option(
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
set_config(
|
@depends("--enable-backgroundtasks")
|
||||||
"MOZ_BACKGROUNDTASKS", depends_if("--enable-backgroundtasks")(lambda _: True)
|
def background_tasks(value):
|
||||||
)
|
return bool(value)
|
||||||
|
|
||||||
|
|
||||||
|
set_config("MOZ_BACKGROUNDTASKS", background_tasks)
|
||||||
|
set_define("MOZ_BACKGROUNDTASKS", background_tasks)
|
||||||
|
|
||||||
|
|
||||||
# Update-related programs: updater, maintenance service, update agent,
|
# Update-related programs: updater, maintenance service, update agent,
|
||||||
|
|
|
@ -92,7 +92,7 @@ if CONFIG["MOZ_TSAN"]:
|
||||||
DEFINES["SPRINTF_H_USES_VSNPRINTF"] = True
|
DEFINES["SPRINTF_H_USES_VSNPRINTF"] = True
|
||||||
DEFINES["NS_NO_XPCOM"] = True
|
DEFINES["NS_NO_XPCOM"] = True
|
||||||
DisableStlWrapping()
|
DisableStlWrapping()
|
||||||
for var in ("MAR_CHANNEL_ID", "MOZ_APP_VERSION", "MOZ_BACKGROUNDTASKS"):
|
for var in ("MAR_CHANNEL_ID", "MOZ_APP_VERSION"):
|
||||||
DEFINES[var] = '"%s"' % CONFIG[var]
|
DEFINES[var] = '"%s"' % CONFIG[var]
|
||||||
|
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
|
|
|
@ -28,9 +28,6 @@ if CONFIG["OS_ARCH"] == "WINNT":
|
||||||
if CONFIG["OS_TARGET"] == "Android":
|
if CONFIG["OS_TARGET"] == "Android":
|
||||||
UNIFIED_SOURCES += ["ProfileUnlockerAndroid.cpp"]
|
UNIFIED_SOURCES += ["ProfileUnlockerAndroid.cpp"]
|
||||||
|
|
||||||
if CONFIG["MOZ_BACKGROUNDTASKS"]:
|
|
||||||
DEFINES["MOZ_BACKGROUNDTASKS"] = True
|
|
||||||
|
|
||||||
UNIFIED_SOURCES += ["nsToolkitProfileService.cpp"]
|
UNIFIED_SOURCES += ["nsToolkitProfileService.cpp"]
|
||||||
|
|
||||||
LOCAL_INCLUDES += [
|
LOCAL_INCLUDES += [
|
||||||
|
|
|
@ -288,7 +288,4 @@ FINAL_TARGET_PP_FILES += ["platform.ini"]
|
||||||
if CONFIG["ENABLE_TESTS"]:
|
if CONFIG["ENABLE_TESTS"]:
|
||||||
DIRS += ["test/gtest"]
|
DIRS += ["test/gtest"]
|
||||||
|
|
||||||
if CONFIG["MOZ_BACKGROUNDTASKS"]:
|
|
||||||
DEFINES["MOZ_BACKGROUNDTASKS"] = True
|
|
||||||
|
|
||||||
REQUIRES_UNIFIED_BUILD = True
|
REQUIRES_UNIFIED_BUILD = True
|
||||||
|
|
|
@ -182,7 +182,7 @@ DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"]
|
||||||
# Turn `firefox` into `Firefox`.
|
# Turn `firefox` into `Firefox`.
|
||||||
DEFINES["MOZ_TOAST_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"].title()
|
DEFINES["MOZ_TOAST_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"].title()
|
||||||
|
|
||||||
for var in ("MOZ_ENABLE_D3D10_LAYER", "MOZ_BACKGROUNDTASKS"):
|
for var in ("MOZ_ENABLE_D3D10_LAYER",):
|
||||||
if CONFIG[var]:
|
if CONFIG[var]:
|
||||||
DEFINES[var] = True
|
DEFINES[var] = True
|
||||||
|
|
||||||
|
|
|
@ -257,6 +257,3 @@ LOCAL_INCLUDES += [
|
||||||
|
|
||||||
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
|
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
|
||||||
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
|
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
|
||||||
|
|
||||||
if CONFIG["MOZ_BACKGROUNDTASKS"]:
|
|
||||||
DEFINES["MOZ_BACKGROUNDTASKS"] = True
|
|
||||||
|
|
|
@ -78,9 +78,6 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
|
||||||
if CONFIG["MOZ_ENABLE_DBUS"]:
|
if CONFIG["MOZ_ENABLE_DBUS"]:
|
||||||
CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]
|
CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]
|
||||||
|
|
||||||
if CONFIG["MOZ_BACKGROUNDTASKS"]:
|
|
||||||
DEFINES["MOZ_BACKGROUNDTASKS"] = True
|
|
||||||
|
|
||||||
include("/ipc/chromium/chromium-config.mozbuild")
|
include("/ipc/chromium/chromium-config.mozbuild")
|
||||||
|
|
||||||
PYTHON_UNITTEST_MANIFESTS += [
|
PYTHON_UNITTEST_MANIFESTS += [
|
||||||
|
|
Загрузка…
Ссылка в новой задаче