diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-17 14:09:31 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-17 14:09:31 -0500 |
| commit | 9dcf77e4c67b159040f1f07aca9a8cad8008a914 (patch) | |
| tree | 5b05a1773a34812c5dcbcb257a245fd189518c5a /docshell | |
| parent | f28984b853667da9f9841e9fa090162e4a3af499 (diff) | |
| download | uxp-9dcf77e4c67b159040f1f07aca9a8cad8008a914.tar.gz | |
Split MOZ_DEVTOOLS into MOZ_DEVTOOLS (client) and MOZ_DEVTOOLS_SERVER (backend) and make both optional
Diffstat (limited to 'docshell')
| -rw-r--r-- | docshell/base/moz.build | 3 | ||||
| -rw-r--r-- | docshell/base/nsAboutRedirector.cpp | 2 | ||||
| -rw-r--r-- | docshell/build/moz.build | 3 | ||||
| -rw-r--r-- | docshell/build/nsDocShellModule.cpp | 2 |
4 files changed, 2 insertions, 8 deletions
diff --git a/docshell/base/moz.build b/docshell/base/moz.build index 1eb04c2273..6ea3e6d281 100644 --- a/docshell/base/moz.build +++ b/docshell/base/moz.build @@ -81,8 +81,5 @@ LOCAL_INCLUDES += [ if CONFIG['MOZ_TOOLKIT_SEARCH']: DEFINES['MOZ_TOOLKIT_SEARCH'] = True -if CONFIG['MOZ_DEVTOOLS'] == 'all': - DEFINES['MOZ_DEVTOOLS_ALL'] = True - if CONFIG['GNU_CXX']: CXXFLAGS += ['-Wno-error=shadow'] diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp index 467e563d53..cb62eacbb6 100644 --- a/docshell/base/nsAboutRedirector.cpp +++ b/docshell/base/nsAboutRedirector.cpp @@ -57,7 +57,7 @@ static RedirEntry kRedirMap[] = { "credits", "https://www.mozilla.org/credits/", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT }, -#ifdef MOZ_DEVTOOLS_ALL +#ifdef MOZ_DEVTOOLS { "debugging", "chrome://devtools/content/aboutdebugging/aboutdebugging.xhtml", nsIAboutModule::ALLOW_SCRIPT diff --git a/docshell/build/moz.build b/docshell/build/moz.build index 130ec8736a..e47bd89eda 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 1e62e14794..d43c305f9b 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 }, |