diff options
| -rw-r--r-- | application/basilisk/components/search/service/nsSearchService.js | 8 | ||||
| -rw-r--r-- | devtools/shared/qrcode/moz.build | 9 | ||||
| -rwxr-xr-x | dom/base/moz.build | 11 | ||||
| -rw-r--r-- | dom/bindings/moz.build | 2 | ||||
| -rw-r--r-- | dom/push/PushServiceAndroidGCM.jsm | 275 | ||||
| -rw-r--r-- | dom/push/moz.build | 14 | ||||
| -rw-r--r-- | dom/webidl/moz.build | 2 | ||||
| -rw-r--r-- | security/manager/moz.build | 2 | ||||
| -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 |
15 files changed, 11 insertions, 361 deletions
diff --git a/application/basilisk/components/search/service/nsSearchService.js b/application/basilisk/components/search/service/nsSearchService.js index 2ea9384f5..b4db31dee 100644 --- a/application/basilisk/components/search/service/nsSearchService.js +++ b/application/basilisk/components/search/service/nsSearchService.js @@ -4219,10 +4219,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 = { @@ -4263,10 +4259,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: XPCOMUtils.generateQI([ diff --git a/devtools/shared/qrcode/moz.build b/devtools/shared/qrcode/moz.build index c9493a538..293bbcc93 100644 --- a/devtools/shared/qrcode/moz.build +++ b/devtools/shared/qrcode/moz.build @@ -5,15 +5,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIRS += [ - 'encoder' + 'decoder', + 'encoder', ] -# Save file size on Fennec until there are active plans to use the decoder there -if not CONFIG['MOZ_FENNEC']: - DIRS += [ - 'decoder' - ] - DevToolsModules( 'index.js', ) diff --git a/dom/base/moz.build b/dom/base/moz.build index 77eb01ba6..ebb76d617 100755 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -410,17 +410,12 @@ EXTRA_COMPONENTS += [ 'contentAreaDropListener.manifest', 'messageWakeupService.js', 'messageWakeupService.manifest', + 'SiteSpecificUserAgent.js', + 'SiteSpecificUserAgent.manifest', 'SlowScriptDebug.js', 'SlowScriptDebug.manifest', ] -# Firefox for Android provides an alternate version of this component -if not CONFIG['MOZ_FENNEC']: - EXTRA_COMPONENTS += [ - 'SiteSpecificUserAgent.js', - 'SiteSpecificUserAgent.manifest', - ] - EXTRA_JS_MODULES += [ 'DOMRequestHelper.jsm', 'IndexedDBHelper.jsm', @@ -471,7 +466,7 @@ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' -if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']: +if CONFIG['MOZ_PHOENIX'] 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 7e1358e9c..043b3c494 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_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']: +if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_XULRUNNER']: # This is needed for Window.webidl DEFINES['HAVE_SIDEBAR'] = True diff --git a/dom/push/PushServiceAndroidGCM.jsm b/dom/push/PushServiceAndroidGCM.jsm deleted file mode 100644 index ed07be339..000000000 --- a/dom/push/PushServiceAndroidGCM.jsm +++ /dev/null @@ -1,275 +0,0 @@ -/* jshint moz: true, esnext: true */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -"use strict"; - -const Cc = Components.classes; -const Ci = Components.interfaces; -const Cu = Components.utils; -const Cr = Components.results; - -const {PushDB} = Cu.import("resource://gre/modules/PushDB.jsm"); -const {PushRecord} = Cu.import("resource://gre/modules/PushRecord.jsm"); -const {PushCrypto} = Cu.import("resource://gre/modules/PushCrypto.jsm"); -Cu.import("resource://gre/modules/Messaging.jsm"); /*global: Messaging */ -Cu.import("resource://gre/modules/Services.jsm"); /*global: Services */ -Cu.import("resource://gre/modules/Preferences.jsm"); /*global: Preferences */ -Cu.import("resource://gre/modules/Promise.jsm"); /*global: Promise */ -Cu.import("resource://gre/modules/XPCOMUtils.jsm"); /*global: XPCOMUtils */ - -const Log = Cu.import("resource://gre/modules/AndroidLog.jsm", {}).AndroidLog.bind("Push"); - -this.EXPORTED_SYMBOLS = ["PushServiceAndroidGCM"]; - -XPCOMUtils.defineLazyGetter(this, "console", () => { - let {ConsoleAPI} = Cu.import("resource://gre/modules/Console.jsm", {}); - return new ConsoleAPI({ - dump: Log.i, - maxLogLevelPref: "dom.push.loglevel", - prefix: "PushServiceAndroidGCM", - }); -}); - -const kPUSHANDROIDGCMDB_DB_NAME = "pushAndroidGCM"; -const kPUSHANDROIDGCMDB_DB_VERSION = 5; // Change this if the IndexedDB format changes -const kPUSHANDROIDGCMDB_STORE_NAME = "pushAndroidGCM"; - -const FXA_PUSH_SCOPE = "chrome://fxa-push"; - -const prefs = new Preferences("dom.push."); - -/** - * The implementation of WebPush push backed by Android's GCM - * delivery. - */ -this.PushServiceAndroidGCM = { - _mainPushService: null, - _serverURI: null, - - newPushDB: function() { - return new PushDB(kPUSHANDROIDGCMDB_DB_NAME, - kPUSHANDROIDGCMDB_DB_VERSION, - kPUSHANDROIDGCMDB_STORE_NAME, - "channelID", - PushRecordAndroidGCM); - }, - - validServerURI: function(serverURI) { - if (!serverURI) { - return false; - } - - if (serverURI.scheme == "https") { - return true; - } - if (serverURI.scheme == "http") { - // Allow insecure server URLs for development and testing. - return !!prefs.get("testing.allowInsecureServerURL"); - } - console.info("Unsupported Android GCM dom.push.serverURL scheme", serverURI.scheme); - return false; - }, - - observe: function(subject, topic, data) { - switch (topic) { - case "nsPref:changed": - if (data == "dom.push.debug") { - // Reconfigure. - let debug = !!prefs.get("debug"); - console.info("Debug parameter changed; updating configuration with new debug", debug); - this._configure(this._serverURI, debug); - } - break; - case "PushServiceAndroidGCM:ReceivedPushMessage": - this._onPushMessageReceived(data); - break; - default: - break; - } - }, - - _onPushMessageReceived(data) { - // TODO: Use Messaging.jsm for this. - if (this._mainPushService == null) { - // Shouldn't ever happen, but let's be careful. - console.error("No main PushService! Dropping message."); - return; - } - if (!data) { - console.error("No data from Java! Dropping message."); - return; - } - data = JSON.parse(data); - console.debug("ReceivedPushMessage with data", data); - - let { headers, message } = this._messageAndHeaders(data); - - console.debug("Delivering message to main PushService:", message, headers); - this._mainPushService.receivedPushMessage( - data.channelID, "", headers, message, (record) => { - // Always update the stored record. - return record; - }); - }, - - _messageAndHeaders(data) { - // Default is no data (and no encryption). - let message = null; - let headers = null; - - if (data.message && data.enc && (data.enckey || data.cryptokey)) { - headers = { - encryption_key: data.enckey, - crypto_key: data.cryptokey, - encryption: data.enc, - encoding: data.con, - }; - // Ciphertext is (urlsafe) Base 64 encoded. - message = ChromeUtils.base64URLDecode(data.message, { - // The Push server may append padding. - padding: "ignore", - }); - } - return { headers, message }; - }, - - _configure: function(serverURL, debug) { - return Messaging.sendRequestForResult({ - type: "PushServiceAndroidGCM:Configure", - endpoint: serverURL.spec, - debug: debug, - }); - }, - - init: function(options, mainPushService, serverURL) { - console.debug("init()"); - this._mainPushService = mainPushService; - this._serverURI = serverURL; - - prefs.observe("debug", this); - Services.obs.addObserver(this, "PushServiceAndroidGCM:ReceivedPushMessage", false); - - return this._configure(serverURL, !!prefs.get("debug")).then(() => { - Messaging.sendRequestForResult({ - type: "PushServiceAndroidGCM:Initialized" - }); - }); - }, - - uninit: function() { - console.debug("uninit()"); - Messaging.sendRequestForResult({ - type: "PushServiceAndroidGCM:Uninitialized" - }); - - this._mainPushService = null; - Services.obs.removeObserver(this, "PushServiceAndroidGCM:ReceivedPushMessage"); - prefs.ignore("debug", this); - }, - - onAlarmFired: function() { - // No action required. - }, - - connect: function(records) { - console.debug("connect:", records); - // It's possible for the registration or subscriptions backing the - // PushService to not be registered with the underlying AndroidPushService. - // Expire those that are unrecognized. - return Messaging.sendRequestForResult({ - type: "PushServiceAndroidGCM:DumpSubscriptions", - }) - .then(subscriptions => { - console.debug("connect:", subscriptions); - // subscriptions maps chid => subscription data. - return Promise.all(records.map(record => { - if (subscriptions.hasOwnProperty(record.keyID)) { - console.debug("connect:", "hasOwnProperty", record.keyID); - return Promise.resolve(); - } - console.debug("connect:", "!hasOwnProperty", record.keyID); - // Subscription is known to PushService.jsm but not to AndroidPushService. Drop it. - return this._mainPushService.dropRegistrationAndNotifyApp(record.keyID) - .catch(error => { - console.error("connect: Error dropping registration", record.keyID, error); - }); - })); - }); - }, - - isConnected: function() { - return this._mainPushService != null; - }, - - disconnect: function() { - console.debug("disconnect"); - }, - - register: function(record) { - console.debug("register:", record); - let ctime = Date.now(); - let appServerKey = record.appServerKey ? - ChromeUtils.base64URLEncode(record.appServerKey, { - // The Push server requires padding. - pad: true, - }) : null; - let message = { - type: "PushServiceAndroidGCM:SubscribeChannel", - appServerKey: appServerKey, - } - if (record.scope == FXA_PUSH_SCOPE) { - message.service = "fxa"; - } - // Caller handles errors. - return Messaging.sendRequestForResult(message) - .then(data => { - console.debug("Got data:", data); - return PushCrypto.generateKeys() - .then(exportedKeys => - new PushRecordAndroidGCM({ - // Straight from autopush. - channelID: data.channelID, - pushEndpoint: data.endpoint, - // Common to all PushRecord implementations. - scope: record.scope, - originAttributes: record.originAttributes, - ctime: ctime, - systemRecord: record.systemRecord, - // Cryptography! - p256dhPublicKey: exportedKeys[0], - p256dhPrivateKey: exportedKeys[1], - authenticationSecret: PushCrypto.generateAuthenticationSecret(), - appServerKey: record.appServerKey, - }) - ); - }); - }, - - unregister: function(record) { - console.debug("unregister: ", record); - return Messaging.sendRequestForResult({ - type: "PushServiceAndroidGCM:UnsubscribeChannel", - channelID: record.keyID, - }); - }, - - reportDeliveryError: function(messageID, reason) { - console.warn("reportDeliveryError: Ignoring message delivery error", - messageID, reason); - }, -}; - -function PushRecordAndroidGCM(record) { - PushRecord.call(this, record); - this.channelID = record.channelID; -} - -PushRecordAndroidGCM.prototype = Object.create(PushRecord.prototype, { - keyID: { - get() { - return this.channelID; - }, - }, -}); diff --git a/dom/push/moz.build b/dom/push/moz.build index 35683120f..7eee8896f 100644 --- a/dom/push/moz.build +++ b/dom/push/moz.build @@ -14,20 +14,10 @@ EXTRA_JS_MODULES += [ 'PushDB.jsm', 'PushRecord.jsm', 'PushService.jsm', + 'PushServiceHttp2.jsm', + 'PushServiceWebSocket.jsm', ] -if not CONFIG['MOZ_FENNEC']: - # Everything but Fennec. - EXTRA_JS_MODULES += [ - 'PushServiceHttp2.jsm', - 'PushServiceWebSocket.jsm', - ] -else: - # Fennec only. - EXTRA_JS_MODULES += [ - 'PushServiceAndroidGCM.jsm', - ] - MOCHITEST_MANIFESTS += [ 'test/mochitest.ini', ] diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index aae7e479c..0fe10eff9 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -746,7 +746,7 @@ if CONFIG['MOZ_BUILD_APP'] in ['xulrunner'] or CONFIG['MOZ_PHOENIX'] or CONFIG[' 'BrowserFeedWriter.webidl', ] -if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']: +if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_XULRUNNER']: WEBIDL_FILES += [ 'External.webidl', ] diff --git a/security/manager/moz.build b/security/manager/moz.build index bb2d2e95f..c5eae95be 100644 --- a/security/manager/moz.build +++ b/security/manager/moz.build @@ -6,5 +6,5 @@ DIRS += ['ssl', 'locales'] -if CONFIG['MOZ_XUL'] and not CONFIG['MOZ_FENNEC']: +if CONFIG['MOZ_XUL']: DIRS += ['pki'] 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 |