Bug 843452 - Part 6: Build MobileConnection DOM/IPC by default. r=smaug,khuey
☠☠ backed out by de824c1ec349 ☠ ☠
authorEdgar Chen <echen@mozilla.com>
Tue, 05 Aug 2014 18:01:14 +0800
changeset 224044 e72a0297d488893caff937f512c34817c62c4198
parent 224043 73f62ce4190f9ff238ea2c30acde5f38dc01701c
child 224045 7a713e55c675e72ca81389a1bc5b5a33fb3aebad
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug, khuey
bugs843452
milestone34.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/src/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/src/moz.build
+++ b/dom/mobileconnection/src/moz.build
@@ -35,17 +35,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
@@ -55,16 +55,17 @@ DIRS += [
     'fetch',
     'filehandle',
     'filesystem',
     'fmradio',
     'asmjscache',
     'mathml',
     'media',
     'messages',
+    'mobileconnection',
     'power',
     'push',
     'quota',
     'settings',
     'mobilemessage',
     'src',
     'time',
     'locales',
@@ -99,17 +100,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',