Bug 1191067 - Pre: Don't include services/fxaccounts in Fennec. r=markh
authorNick Alexander <nalexander@mozilla.com>
Wed, 19 Aug 2015 16:44:09 -0700
changeset 258723 c313396de663d4e33b9301090cd151873980cb09
parent 258722 dce78cf37b68d5b9db981806c27c4b8ec8e784a9
child 258724 85e65549172db05871dbe39c2e33c845fc3ed10b
push id29262
push userryanvm@gmail.com
push dateSun, 23 Aug 2015 19:07:39 +0000
treeherderautoland@378d72d8bdf4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarkh
bugs1191067
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1191067 - Pre: Don't include services/fxaccounts in Fennec. r=markh This also reveals the underlying exception when there is a failure in a WebChannel callback.
services/moz.build
toolkit/modules/WebChannel.jsm
--- a/services/moz.build
+++ b/services/moz.build
@@ -2,20 +2,21 @@
 # vim: set filetype=python:
 # 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/.
 
 DIRS += [
     'common',
     'crypto',
-    'fxaccounts',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
+    DIRS += ['fxaccounts']
+
     # MOZ_SERVICES_HEALTHREPORT and therefore MOZ_DATA_REPORTING are
     # defined on Android, but these features are implemented using Java.
     if CONFIG['MOZ_SERVICES_HEALTHREPORT']:
         DIRS += ['healthreport']
 
     if CONFIG['MOZ_DATA_REPORTING']:
         DIRS += ['datareporting']
 
--- a/toolkit/modules/WebChannel.jsm
+++ b/toolkit/modules/WebChannel.jsm
@@ -304,15 +304,16 @@ this.WebChannel.prototype = {
     if (this._deliverCallback) {
       try {
         this._deliverCallback(data.id, data.message, sendingContext);
       } catch (ex) {
         this.send({
           errno: ERRNO_UNKNOWN_ERROR,
           error: ex.message ? ex.message : ERROR_UNKNOWN
         }, sendingContext);
-        Cu.reportError("Failed to execute callback:" + ex);
+        Cu.reportError("Failed to execute WebChannel callback:");
+        Cu.reportError(ex);
       }
     } else {
       Cu.reportError("No callback set for this channel.");
     }
   }
 };