Bug 1195388 - Pre: Include services-* resource:// registrations in b2gdroid. r=fabrice
authorNick Alexander <nalexander@mozilla.com>
Tue, 25 Aug 2015 11:28:41 -0700
changeset 259714 6eb3179f73df6609342dc416da595337acd74c25
parent 259713 8236022b63e6027e70d488cca0714ca806246a37
child 259715 936e69f7fedd22191496facc8beaa5a1005c2150
push id29289
push userryanvm@gmail.com
push dateFri, 28 Aug 2015 12:44:52 +0000
treeherdermozilla-central@c559c25f4954 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfabrice
bugs1195388
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 1195388 - Pre: Include services-* resource:// registrations in b2gdroid. r=fabrice
services/common/moz.build
services/moz.build
--- a/services/common/moz.build
+++ b/services/common/moz.build
@@ -14,17 +14,17 @@ EXTRA_COMPONENTS += [
 ]
 
 EXTRA_JS_MODULES['services-common'] += [
     'logmanager.js',
     'stringbundle.js',
     'utils.js',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android' or CONFIG['MOZ_B2GDROID']:
     EXTRA_JS_MODULES['services-common'] += [
         'hawkclient.js',
         'hawkrequest.js',
         'tokenserverclient.js',
     ]
 
     TESTING_JS_MODULES.services.common += [
         'modules-testing/storageserver.js',
--- a/services/moz.build
+++ b/services/moz.build
@@ -4,19 +4,20 @@
 # 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',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android' or CONFIG['MOZ_B2GDROID']:
     DIRS += ['fxaccounts']
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     # 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']