Bug 843452 - Part 6: Build MobileConnection DOM/IPC by default. r=smaug,khuey
authorEdgar Chen <echen@mozilla.com>
Tue, 05 Aug 2014 18:01:14 +0800
changeset 226384 cfd71a5a178eba5cfd6cc98d3e6795dbea4d2717
parent 226383 79222e32c3a173153aa20660e776e91401903a3f
child 226385 bad76a342c2cf35416295df28ae66c92d458cff6
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug, khuey
bugs843452
milestone35.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 843452 - Part 6: Build MobileConnection DOM/IPC by default. r=smaug,khuey
dom/mobileconnection/interfaces/moz.build
dom/mobileconnection/moz.build
dom/moz.build
dom/webidl/MozMobileConnectionArray.webidl
dom/webidl/moz.build
--- a/dom/mobileconnection/interfaces/moz.build
+++ b/dom/mobileconnection/interfaces/moz.build
@@ -8,14 +8,14 @@ XPIDL_SOURCES += [
     'nsICellInfo.idl',
     'nsIMobileCellInfo.idl',
     'nsIMobileConnectionInfo.idl',
     'nsIMobileConnectionService.idl',
     'nsIMobileNetworkInfo.idl',
     'nsINeighboringCellInfo.idl',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
     XPIDL_SOURCES += [
         'nsIMobileConnectionGonkService.idl',
     ]
 
 XPIDL_MODULE = 'dom_mobileconnection'
--- a/dom/mobileconnection/moz.build
+++ b/dom/mobileconnection/moz.build
@@ -39,17 +39,17 @@ SOURCES += [
 ]
 
 IPDL_SOURCES += [
     'ipc/PMobileConnection.ipdl',
     'ipc/PMobileConnectionRequest.ipdl',
     'ipc/PMobileConnectionTypes.ipdlh',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
     EXTRA_COMPONENTS += [
         'gonk/MobileConnectionGonkService.js',
         'gonk/MobileConnectionGonkService.manifest',
     ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -60,16 +60,17 @@ DIRS += [
     'fmradio',
     'geolocation',
     'json',
     'jsurl',
     'asmjscache',
     'mathml',
     'media',
     'messages',
+    'mobileconnection',
     'notification',
     'offline',
     'power',
     'push',
     'quota',
     'settings',
     'storage',
     'mobilemessage',
@@ -106,17 +107,16 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
         'tethering',
         'wifi',
     ]
 
 if CONFIG['MOZ_B2G_RIL']:
     DIRS += [
         'icc',
         'cellbroadcast',
-        'mobileconnection',
         'voicemail',
         'wappush',
     ]
 
 if CONFIG['MOZ_PAY']:
     DIRS += ['payment']
 
 if CONFIG['MOZ_GAMEPAD']:
--- a/dom/webidl/MozMobileConnectionArray.webidl
+++ b/dom/webidl/MozMobileConnectionArray.webidl
@@ -1,10 +1,11 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* 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/.
  */
 
+[Pref="dom.mobileconnection.enabled"]
 interface MozMobileConnectionArray {
   getter MozMobileConnection? item(unsigned long index);
   readonly attribute unsigned long length;
 };
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -94,16 +94,17 @@ WEBIDL_FILES = [
     'Document.webidl',
     'DocumentFragment.webidl',
     'DocumentType.webidl',
     'DOMCursor.webidl',
     'DOMError.webidl',
     'DOMException.webidl',
     'DOMImplementation.webidl',
     'DOMMatrix.webidl',
+    'DOMMMIError.webidl',
     'DOMMobileMessageError.webidl',
     'DOMParser.webidl',
     'DOMPoint.webidl',
     'DOMQuad.webidl',
     'DOMRect.webidl',
     'DOMRectList.webidl',
     'DOMRequest.webidl',
     'DOMSettableTokenList.webidl',
@@ -256,17 +257,22 @@ WEBIDL_FILES = [
     'MessagePort.webidl',
     'MessagePortList.webidl',
     'MimeType.webidl',
     'MimeTypeArray.webidl',
     'MouseEvent.webidl',
     'MouseScrollEvent.webidl',
     'MozActivity.webidl',
     'MozMmsMessage.webidl',
+    'MozMobileCellInfo.webidl',
+    'MozMobileConnection.webidl',
+    'MozMobileConnectionArray.webidl',
+    'MozMobileConnectionInfo.webidl',
     'MozMobileMessageManager.webidl',
+    'MozMobileNetworkInfo.webidl',
     'MozPowerManager.webidl',
     'MozSelfSupport.webidl',
     'MozTetheringManager.webidl',
     'MozTimeManager.webidl',
     'MozWakeLock.webidl',
     'MutationEvent.webidl',
     'MutationObserver.webidl',
     'NamedNodeMap.webidl',
@@ -585,26 +591,20 @@ if CONFIG['MOZ_B2G_BT']:
         WEBIDL_FILES += [
             'BluetoothAdapter.webidl',
             'BluetoothDevice.webidl',
             'BluetoothManager.webidl',
         ]
 
 if CONFIG['MOZ_B2G_RIL']:
     WEBIDL_FILES += [
-        'DOMMMIError.webidl',
         'IccCardLockError.webidl',
         'MozCellBroadcast.webidl',
         'MozIcc.webidl',
         'MozIccManager.webidl',
-        'MozMobileCellInfo.webidl',
-        'MozMobileConnection.webidl',
-        'MozMobileConnectionArray.webidl',
-        'MozMobileConnectionInfo.webidl',
-        'MozMobileNetworkInfo.webidl',
         'MozVoicemail.webidl',
         'MozVoicemailStatus.webidl'
     ]
 
 if CONFIG['MOZ_NFC']:
     WEBIDL_FILES += [
          'MozNDEFRecord.webidl',
          'MozNFC.webidl',