From 11a8a39f6d2e057d51559c52c1bf0ba74bbfe189 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 1 Mar 2018 14:26:41 -0500 Subject: Use MOZ_FENNEC and MOZ_XULRUNNER instead of checking MOZ_BUILD_APP in most places --- devtools/shared/qrcode/moz.build | 2 +- dom/base/moz.build | 4 ++-- dom/bindings/moz.build | 2 +- dom/push/moz.build | 2 +- dom/webidl/moz.build | 2 +- mobile/android/configure.in | 12 ++++++++++++ mobile/android/confvars.sh | 1 + security/manager/moz.build | 2 +- toolkit/components/cookie/moz.build | 3 --- toolkit/components/moz.build | 2 +- toolkit/components/search/moz.build | 4 ++-- toolkit/components/search/nsSearchService.js | 12 ++++++------ toolkit/content/moz.build | 3 --- toolkit/locales/moz.build | 3 --- toolkit/mozapps/installer/package-name.mk | 2 +- toolkit/mozapps/installer/upload-files-APK.mk | 2 +- toolkit/mozapps/webextensions/moz.build | 3 --- 17 files changed, 31 insertions(+), 30 deletions(-) create mode 100644 mobile/android/configure.in diff --git a/devtools/shared/qrcode/moz.build b/devtools/shared/qrcode/moz.build index 68a093b1c..41516675b 100644 --- a/devtools/shared/qrcode/moz.build +++ b/devtools/shared/qrcode/moz.build @@ -9,7 +9,7 @@ DIRS += [ ] # Save file size on Fennec until there are active plans to use the decoder there -if CONFIG['MOZ_BUILD_APP'] != 'mobile/android': +if CONFIG['MOZ_FENNEC']: DIRS += [ 'decoder' ] diff --git a/dom/base/moz.build b/dom/base/moz.build index 0bc9902e4..686d76e73 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -411,7 +411,7 @@ EXTRA_COMPONENTS += [ ] # Firefox for Android provides an alternate version of this component -if CONFIG['MOZ_BUILD_APP'] != 'mobile/android': +if not CONFIG['MOZ_FENNEC']: EXTRA_COMPONENTS += [ 'SiteSpecificUserAgent.js', 'SiteSpecificUserAgent.manifest', @@ -472,7 +472,7 @@ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' -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 if CONFIG['MOZ_X11']: diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build index eb00482c6..f1ce9e276 100644 --- a/dom/bindings/moz.build +++ b/dom/bindings/moz.build @@ -139,7 +139,7 @@ FINAL_LIBRARY = 'xul' SPHINX_TREES['webidl'] = 'docs' SPHINX_PYTHON_PACKAGE_DIRS += ['mozwebidlcodegen'] -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']: # This is needed for Window.webidl DEFINES['HAVE_SIDEBAR'] = True diff --git a/dom/push/moz.build b/dom/push/moz.build index b96099161..35683120f 100644 --- a/dom/push/moz.build +++ b/dom/push/moz.build @@ -16,7 +16,7 @@ EXTRA_JS_MODULES += [ 'PushService.jsm', ] -if CONFIG['MOZ_BUILD_APP'] != 'mobile/android': +if not CONFIG['MOZ_FENNEC']: # Everything but Fennec. EXTRA_JS_MODULES += [ 'PushServiceHttp2.jsm', diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index 5dc637799..8682aee97 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -773,7 +773,7 @@ if CONFIG['MOZ_BUILD_APP'] in ['xulrunner'] or CONFIG['MOZ_PHOENIX'] or CONFIG[' 'BrowserFeedWriter.webidl', ] -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']: WEBIDL_FILES += [ 'External.webidl', ] diff --git a/mobile/android/configure.in b/mobile/android/configure.in new file mode 100644 index 000000000..9e13f39b3 --- /dev/null +++ b/mobile/android/configure.in @@ -0,0 +1,12 @@ +dnl -*- Mode: Autoconf; tab-width: 2; indent-tabs-mode: nil; -*- +dnl vi: set tabstop=2 shiftwidth=2 expandtab: +dnl This Source Code Form is subject to the terms of the Mozilla Public +dnl License, v. 2.0. If a copy of the MPL was not distributed with this +dnl file, You can obtain one at http://mozilla.org/MPL/2.0/. + +dnl Things we need to carry from confvars.sh +AC_DEFINE(MOZ_FENNEC) +AC_SUBST(MOZ_FENNEC) + +dnl Optional parts of the build. + diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index f2c7ec113..c1b81c079 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -4,6 +4,7 @@ MOZ_APP_BASENAME=Fennec MOZ_APP_VENDOR=Mozilla +MOZ_FENNEC=1 MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt` MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt` diff --git a/security/manager/moz.build b/security/manager/moz.build index 8097ef5f6..4ce95f226 100644 --- a/security/manager/moz.build +++ b/security/manager/moz.build @@ -6,5 +6,5 @@ DIRS += ['ssl', 'locales'] -if CONFIG['MOZ_XUL'] and CONFIG['MOZ_BUILD_APP'] != 'mobile/android': +if CONFIG['MOZ_XUL'] and CONFIG['MOZ_FENNEC']: DIRS += ['pki'] 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([ diff --git a/toolkit/content/moz.build b/toolkit/content/moz.build index cc86890bf..de50a82f5 100644 --- a/toolkit/content/moz.build +++ b/toolkit/content/moz.build @@ -17,9 +17,6 @@ if CONFIG['OS_TARGET'] == 'Android': if CONFIG['MOZ_ANDROID_CXX_STL'] == 'libc++': DEFINES['MOZ_USE_LIBCXX'] = True -if CONFIG['MOZ_BUILD_APP'] == 'mobile/android': - DEFINES['MOZ_FENNEC'] = True - JAR_MANIFESTS += ['jar.mn'] with Files('aboutTelemetry.*'): diff --git a/toolkit/locales/moz.build b/toolkit/locales/moz.build index 91719f14b..0fbac0c89 100644 --- a/toolkit/locales/moz.build +++ b/toolkit/locales/moz.build @@ -4,9 +4,6 @@ # 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 - if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: DEFINES['MOZ_GTK'] = True diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk index a2caff914..d88975f36 100644 --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -22,7 +22,7 @@ endif ifndef MOZ_PKG_PLATFORM MOZ_PKG_PLATFORM := $(TARGET_OS)-$(TARGET_CPU) -ifeq ($(MOZ_BUILD_APP),mobile/android) +ifdef MOZ_FENNEC MOZ_PKG_PLATFORM := android-$(TARGET_CPU) endif diff --git a/toolkit/mozapps/installer/upload-files-APK.mk b/toolkit/mozapps/installer/upload-files-APK.mk index 9bb5b2e18..f9bfd6735 100644 --- a/toolkit/mozapps/installer/upload-files-APK.mk +++ b/toolkit/mozapps/installer/upload-files-APK.mk @@ -23,7 +23,7 @@ GECKO_APP_AP_PATH = $(topobjdir)/mobile/android/base ifdef ENABLE_TESTS INNER_ROBOCOP_PACKAGE=true -ifeq ($(MOZ_BUILD_APP),mobile/android) +ifdef MOZ_FENNEC UPLOAD_EXTRA_FILES += robocop.apk # Robocop/Robotium tests, Android Background tests, and Fennec need to diff --git a/toolkit/mozapps/webextensions/moz.build b/toolkit/mozapps/webextensions/moz.build index 12640e115..b92915ae8 100644 --- a/toolkit/mozapps/webextensions/moz.build +++ b/toolkit/mozapps/webextensions/moz.build @@ -6,9 +6,6 @@ SPHINX_TREES['addon-manager'] = 'docs' -if CONFIG['MOZ_BUILD_APP'] == 'mobile/android': - DEFINES['MOZ_FENNEC'] = True - DIRS += ['internal'] TEST_DIRS += ['test'] -- cgit v1.2.3