diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-03-01 14:26:41 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-03-01 14:26:41 -0500 |
| commit | 11a8a39f6d2e057d51559c52c1bf0ba74bbfe189 (patch) | |
| tree | 06ace3e2923e6ca0fafe4453dac5988c54387eb6 /toolkit/components | |
| parent | 17e72c824ed54ced83a2943237340f8d1b7b1824 (diff) | |
| download | UXP-11a8a39f6d2e057d51559c52c1bf0ba74bbfe189.tar UXP-11a8a39f6d2e057d51559c52c1bf0ba74bbfe189.tar.gz UXP-11a8a39f6d2e057d51559c52c1bf0ba74bbfe189.tar.lz UXP-11a8a39f6d2e057d51559c52c1bf0ba74bbfe189.tar.xz UXP-11a8a39f6d2e057d51559c52c1bf0ba74bbfe189.zip | |
Use MOZ_FENNEC and MOZ_XULRUNNER instead of checking MOZ_BUILD_APP in most places
Diffstat (limited to 'toolkit/components')
| -rw-r--r-- | toolkit/components/cookie/moz.build | 3 | ||||
| -rw-r--r-- | toolkit/components/moz.build | 2 | ||||
| -rw-r--r-- | toolkit/components/search/moz.build | 4 | ||||
| -rw-r--r-- | toolkit/components/search/nsSearchService.js | 12 |
4 files changed, 9 insertions, 12 deletions
diff --git a/toolkit/components/cookie/moz.build b/toolkit/components/cookie/moz.build index e3ed99703..aac3a838c 100644 --- a/toolkit/components/cookie/moz.build +++ b/toolkit/components/cookie/moz.build @@ -4,7 +4,4 @@ # 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/. -if CONFIG['MOZ_BUILD_APP'] == 'mobile/android': - DEFINES['MOZ_FENNEC'] = True - JAR_MANIFESTS += ['jar.mn'] diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build index ce8722910..12e1748e9 100644 --- a/toolkit/components/moz.build +++ b/toolkit/components/moz.build @@ -73,7 +73,7 @@ if CONFIG['MOZ_WEBEXTENSIONS']: if CONFIG['ENABLE_INTL_API']: DIRS += ['mozintl'] -if CONFIG['MOZ_BUILD_APP'] != 'mobile/android': +if not CONFIG['MOZ_FENNEC']: DIRS += ['narrate', 'viewsource']; if CONFIG['NS_PRINTING']: diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build index 2dc142882..b06816c34 100644 --- a/toolkit/components/search/moz.build +++ b/toolkit/components/search/moz.build @@ -11,9 +11,9 @@ EXTRA_COMPONENTS += [ 'nsSearchSuggestions.js', ] -if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']:
+if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
DEFINES['HAVE_SIDEBAR'] = True
- EXTRA_COMPONENTS += [ + EXTRA_PP_COMPONENTS += [ 'nsSidebar.js', ] diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/nsSearchService.js index bbe66ba7e..8abe56d2f 100644 --- a/toolkit/components/search/nsSearchService.js +++ b/toolkit/components/search/nsSearchService.js @@ -4676,9 +4676,9 @@ SearchService.prototype = { Services.obs.addObserver(this, SEARCH_ENGINE_TOPIC, false); Services.obs.addObserver(this, QUIT_APPLICATION_TOPIC, false); - if (AppConstants.MOZ_BUILD_APP == "mobile/android") { - Services.prefs.addObserver(LOCALE_PREF, this, false); - } +#ifdef MOZ_FENNEC + Services.prefs.addObserver(LOCALE_PREF, this, false); +#endif // The current stage of shutdown. Used to help analyze crash // signatures in case of shutdown timeout. @@ -4721,9 +4721,9 @@ SearchService.prototype = { Services.obs.removeObserver(this, SEARCH_ENGINE_TOPIC); Services.obs.removeObserver(this, QUIT_APPLICATION_TOPIC); - if (AppConstants.MOZ_BUILD_APP == "mobile/android") { - Services.prefs.removeObserver(LOCALE_PREF, this); - } +#ifdef MOZ_FENNEC + Services.prefs.removeObserver(LOCALE_PREF, this); +#endif }, QueryInterface: XPCOMUtils.generateQI([ |