From 9dcf77e4c67b159040f1f07aca9a8cad8008a914 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 17 Feb 2018 14:09:31 -0500 Subject: Split MOZ_DEVTOOLS into MOZ_DEVTOOLS (client) and MOZ_DEVTOOLS_SERVER (backend) and make both optional --- docshell/build/moz.build | 3 --- docshell/build/nsDocShellModule.cpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'docshell/build') diff --git a/docshell/build/moz.build b/docshell/build/moz.build index 130ec8736..e47bd89ed 100644 --- a/docshell/build/moz.build +++ b/docshell/build/moz.build @@ -23,6 +23,3 @@ LOCAL_INCLUDES += [ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' - -if CONFIG['MOZ_DEVTOOLS'] == 'all': - DEFINES['MOZ_DEVTOOLS_ALL'] = True diff --git a/docshell/build/nsDocShellModule.cpp b/docshell/build/nsDocShellModule.cpp index 1e62e1479..d43c305f9 100644 --- a/docshell/build/nsDocShellModule.cpp +++ b/docshell/build/nsDocShellModule.cpp @@ -169,7 +169,7 @@ const mozilla::Module::ContractIDEntry kDocShellContracts[] = { { NS_ABOUT_MODULE_CONTRACTID_PREFIX "crashes", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, #endif { NS_ABOUT_MODULE_CONTRACTID_PREFIX "credits", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, -#ifdef MOZ_DEVTOOLS_ALL +#ifdef MOZ_DEVTOOLS { NS_ABOUT_MODULE_CONTRACTID_PREFIX "debugging", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, #endif { NS_ABOUT_MODULE_CONTRACTID_PREFIX "license", &kNS_ABOUT_REDIRECTOR_MODULE_CID }, -- cgit v1.2.3