diff options
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/components/cookie/jar.mn | 2 | ||||
| -rw-r--r-- | toolkit/components/search/moz.build | 2 | ||||
| -rw-r--r-- | toolkit/components/search/nsSearchService.js | 8 | ||||
| -rw-r--r-- | toolkit/content/jar.mn | 4 | ||||
| -rw-r--r-- | toolkit/locales/jar.mn | 14 | ||||
| -rw-r--r-- | toolkit/mozapps/installer/package-name.mk | 4 | ||||
| -rw-r--r-- | toolkit/mozapps/installer/upload-files-APK.mk | 15 |
7 files changed, 1 insertions, 48 deletions
diff --git a/toolkit/components/cookie/jar.mn b/toolkit/components/cookie/jar.mn index 109e6cd4f..2826bbcd6 100644 --- a/toolkit/components/cookie/jar.mn +++ b/toolkit/components/cookie/jar.mn @@ -3,8 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. toolkit.jar: -#ifndef MOZ_FENNEC % content cookie %content/cookie/ content/cookie/cookieAcceptDialog.xul (content/cookieAcceptDialog.xul) content/cookie/cookieAcceptDialog.js (content/cookieAcceptDialog.js) -#endif diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build index 2f8b3e54c..43414963d 100644 --- a/toolkit/components/search/moz.build +++ b/toolkit/components/search/moz.build @@ -11,7 +11,7 @@ EXTRA_PP_COMPONENTS += [ 'toolkitsearch.manifest', ] -if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
+if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_XULRUNNER']:
DEFINES['HAVE_SIDEBAR'] = True
EXTRA_COMPONENTS += ['nsSidebar.js'] diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/nsSearchService.js index 82f8d155a..19f4048b4 100644 --- a/toolkit/components/search/nsSearchService.js +++ b/toolkit/components/search/nsSearchService.js @@ -4204,10 +4204,6 @@ SearchService.prototype = { Services.obs.addObserver(this, SEARCH_ENGINE_TOPIC, false); Services.obs.addObserver(this, QUIT_APPLICATION_TOPIC, 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. let shutdownState = { @@ -4252,10 +4248,6 @@ SearchService.prototype = { _removeObservers: function SRCH_SVC_removeObservers() { Services.obs.removeObserver(this, SEARCH_ENGINE_TOPIC); Services.obs.removeObserver(this, QUIT_APPLICATION_TOPIC); - -#ifdef MOZ_FENNEC - Services.prefs.removeObserver(LOCALE_PREF, this); -#endif }, QueryInterface: function SRCH_SVC_QI(aIID) { diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index e1d432cb3..5bf6440be 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -42,19 +42,15 @@ toolkit.jar: content/global/browser-content.js * content/global/buildconfig.html content/global/contentAreaUtils.js -#ifndef MOZ_FENNEC content/global/customizeToolbar.css content/global/customizeToolbar.js content/global/customizeToolbar.xul -#endif content/global/datepicker.xhtml -#ifndef MOZ_FENNEC content/global/editMenuOverlay.js * content/global/editMenuOverlay.xul content/global/finddialog.js * content/global/finddialog.xul content/global/findUtils.js -#endif content/global/filepicker.properties content/global/globalOverlay.js content/global/mozilla.xhtml diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn index 99c16de1d..ad93985f1 100644 --- a/toolkit/locales/jar.mn +++ b/toolkit/locales/jar.mn @@ -37,17 +37,13 @@ locale/@AB_CD@/global/contentAreaCommands.properties (%chrome/global/contentAreaCommands.properties) locale/@AB_CD@/global/console.dtd (%chrome/global/console.dtd) locale/@AB_CD@/global/console.properties (%chrome/global/console.properties) -#ifndef MOZ_FENNEC locale/@AB_CD@/global/customizeToolbar.dtd (%chrome/global/customizeToolbar.dtd) locale/@AB_CD@/global/customizeToolbar.properties (%chrome/global/customizeToolbar.properties) -#endif locale/@AB_CD@/global/datetimebox.dtd (%chrome/global/datetimebox.dtd) locale/@AB_CD@/global/datetimepicker.dtd (%chrome/global/datetimepicker.dtd) locale/@AB_CD@/global/dateFormat.properties (%chrome/global/dateFormat.properties) locale/@AB_CD@/global/dialogOverlay.dtd (%chrome/global/dialogOverlay.dtd) -#ifndef MOZ_FENNEC locale/@AB_CD@/global/editMenuOverlay.dtd (%chrome/global/editMenuOverlay.dtd) -#endif locale/@AB_CD@/global/extensions.properties (%chrome/global/extensions.properties) locale/@AB_CD@/global/fallbackMenubar.properties (%chrome/global/fallbackMenubar.properties) locale/@AB_CD@/global/filefield.properties (%chrome/global/filefield.properties) @@ -55,24 +51,19 @@ locale/@AB_CD@/global/filepicker.dtd (%chrome/global/filepicker.dtd) #endif locale/@AB_CD@/global/filepicker.properties (%chrome/global/filepicker.properties) -#ifndef MOZ_FENNEC locale/@AB_CD@/global/findbar.dtd (%chrome/global/findbar.dtd) locale/@AB_CD@/global/findbar.properties (%chrome/global/findbar.properties) locale/@AB_CD@/global/finddialog.dtd (%chrome/global/finddialog.dtd) locale/@AB_CD@/global/finddialog.properties (%chrome/global/finddialog.properties) -#endif locale/@AB_CD@/global/globalKeys.dtd (%chrome/global/globalKeys.dtd) locale/@AB_CD@/global/headsUpDisplay.properties (%chrome/global/headsUpDisplay.properties) locale/@AB_CD@/global/intl.css (%chrome/global/intl.css) locale/@AB_CD@/global/intl.properties (%chrome/global/intl.properties) locale/@AB_CD@/global/keys.properties (%chrome/global/keys.properties) locale/@AB_CD@/global/languageNames.properties (%chrome/global/languageNames.properties) -#ifndef MOZ_FENNEC locale/@AB_CD@/global/narrate.properties (%chrome/global/narrate.properties) -#endif locale/@AB_CD@/global/notification.dtd (%chrome/global/notification.dtd) locale/@AB_CD@/global/preferences.dtd (%chrome/global/preferences.dtd) -#ifndef MOZ_FENNEC locale/@AB_CD@/global/printdialog.dtd (%chrome/global/printdialog.dtd) locale/@AB_CD@/global/printjoboptions.dtd (%chrome/global/printjoboptions.dtd) locale/@AB_CD@/global/printPageSetup.dtd (%chrome/global/printPageSetup.dtd) @@ -80,7 +71,6 @@ locale/@AB_CD@/global/printPreviewProgress.dtd (%chrome/global/printPreviewProgress.dtd) locale/@AB_CD@/global/printdialog.properties (%chrome/global/printdialog.properties) locale/@AB_CD@/global/printProgress.dtd (%chrome/global/printProgress.dtd) -#endif locale/@AB_CD@/global/regionNames.properties (%chrome/global/regionNames.properties) locale/@AB_CD@/global/resetProfile.dtd (%chrome/global/resetProfile.dtd) locale/@AB_CD@/global/resetProfile.properties (%chrome/global/resetProfile.properties) @@ -125,10 +115,8 @@ locale/@AB_CD@/mozapps/profile/createProfileWizard.dtd (%chrome/mozapps/profile/createProfileWizard.dtd) locale/@AB_CD@/mozapps/profile/profileSelection.properties (%chrome/mozapps/profile/profileSelection.properties) locale/@AB_CD@/mozapps/profile/profileSelection.dtd (%chrome/mozapps/profile/profileSelection.dtd) -#ifndef MOZ_FENNEC locale/@AB_CD@/mozapps/update/updates.dtd (%chrome/mozapps/update/updates.dtd) locale/@AB_CD@/mozapps/update/updates.properties (%chrome/mozapps/update/updates.properties) -#endif locale/@AB_CD@/mozapps/update/history.dtd (%chrome/mozapps/update/history.dtd) locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd (%chrome/mozapps/extensions/xpinstallConfirm.dtd) locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties (%chrome/mozapps/extensions/xpinstallConfirm.properties) @@ -137,11 +125,9 @@ % locale alerts @AB_CD@ %locale/@AB_CD@/alerts/ locale/@AB_CD@/alerts/alert.dtd (%chrome/alerts/alert.dtd) locale/@AB_CD@/alerts/alert.properties (%chrome/alerts/alert.properties) -#ifndef MOZ_FENNEC % locale cookie @AB_CD@ %locale/@AB_CD@/cookie/ locale/@AB_CD@/cookie/cookieAcceptDialog.dtd (%chrome/cookie/cookieAcceptDialog.dtd) locale/@AB_CD@/cookie/cookieAcceptDialog.properties (%chrome/cookie/cookieAcceptDialog.properties) -#endif % locale formautofill @AB_CD@ %locale/@AB_CD@/formautofill/ locale/@AB_CD@/formautofill/requestAutocomplete.dtd (%chrome/formautofill/requestAutocomplete.dtd) % locale passwordmgr @AB_CD@ %locale/@AB_CD@/passwordmgr/ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk index 1a8728088..680590b3c 100644 --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -30,10 +30,6 @@ endif ifndef MOZ_PKG_PLATFORM MOZ_PKG_PLATFORM := $(TARGET_OS)-$(TARGET_CPU) -ifdef MOZ_FENNEC -MOZ_PKG_PLATFORM := android-$(TARGET_CPU) -endif - # TARGET_OS/TARGET_CPU may be unintuitive, so we hardcode some special formats ifeq ($(OS_ARCH),WINNT) ifeq ($(TARGET_CPU),x86_64) diff --git a/toolkit/mozapps/installer/upload-files-APK.mk b/toolkit/mozapps/installer/upload-files-APK.mk index f9bfd6735..bf2fa4f9f 100644 --- a/toolkit/mozapps/installer/upload-files-APK.mk +++ b/toolkit/mozapps/installer/upload-files-APK.mk @@ -23,21 +23,6 @@ GECKO_APP_AP_PATH = $(topobjdir)/mobile/android/base ifdef ENABLE_TESTS INNER_ROBOCOP_PACKAGE=true -ifdef MOZ_FENNEC -UPLOAD_EXTRA_FILES += robocop.apk - -# Robocop/Robotium tests, Android Background tests, and Fennec need to -# be signed with the same key, which means release signing them all. - -ifndef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE -robocop_apk := $(topobjdir)/mobile/android/tests/browser/robocop/robocop-debug-unsigned-unaligned.apk -else -robocop_apk := $(topobjdir)/gradle/build/mobile/android/app/outputs/apk/app-automation-debug-androidTest-unaligned.apk -endif - -INNER_ROBOCOP_PACKAGE= \ - $(call RELEASE_SIGN_ANDROID_APK,$(robocop_apk),$(ABS_DIST)/robocop.apk) -endif else INNER_ROBOCOP_PACKAGE=echo 'Testing is disabled - No Android Robocop for you' endif |