Bug 956655 - Part 1: Move MobileConnection related files to dom/mobil…

…econnection. r=smaug,khuey --HG-- rename : dom/network/interfaces/nsIDOMMobileConnection.idl => dom/mobileconnection/interfaces/nsIDOMMobileConnection.idl rename : dom/network/interfaces/nsIMobileConnectionProvider.idl => dom/mobileconnection/interfaces/nsIMobileConnectionProvider.idl rename : dom/network/src/MobileConnection.cpp => dom/mobileconnection/src/MobileConnection.cpp rename : dom/network/src/MobileConnection.h => dom/mobileconnection/src/MobileConnection.h rename : dom/network/src/MobileConnectionArray.cpp => dom/mobileconnection/src/MobileConnectionArray.cpp rename : dom/network/src/MobileConnectionArray.h => dom/mobileconnection/src/MobileConnectionArray.h rename : dom/network/tests/marionette/manifest.ini => dom/mobileconnection/tests/marionette/manifest.ini rename : dom/network/tests/marionette/test_call_barring_change_password.js => dom/mobileconnection/tests/marionette/test_call_barring_change_password.js rename : dom/network/tests/marionette/test_call_barring_get_option.js => dom/mobileconnection/tests/marionette/test_call_barring_get_option.js rename : dom/network/tests/marionette/test_call_barring_set_error.js => dom/mobileconnection/tests/marionette/test_call_barring_set_error.js rename : dom/network/tests/marionette/test_mobile_data_connection.js => dom/mobileconnection/tests/marionette/test_mobile_data_connection.js rename : dom/network/tests/marionette/test_mobile_data_location.js => dom/mobileconnection/tests/marionette/test_mobile_data_location.js rename : dom/network/tests/marionette/test_mobile_data_state.js => dom/mobileconnection/tests/marionette/test_mobile_data_state.js rename : dom/network/tests/marionette/test_mobile_last_known_network.js => dom/mobileconnection/tests/marionette/test_mobile_last_known_network.js rename : dom/network/tests/marionette/test_mobile_mmi.js => dom/mobileconnection/tests/marionette/test_mobile_mmi.js rename : dom/network/tests/marionette/test_mobile_networks.js => dom/mobileconnection/tests/marionette/test_mobile_networks.js rename : dom/network/tests/marionette/test_mobile_operator_names.js => dom/mobileconnection/tests/marionette/test_mobile_operator_names.js rename : dom/network/tests/marionette/test_mobile_preferred_network_type.js => dom/mobileconnection/tests/marionette/test_mobile_preferred_network_type.js rename : dom/network/tests/marionette/test_mobile_preferred_network_type_by_setting.js => dom/mobileconnection/tests/marionette/test_mobile_preferred_network_type_by_setting.js rename : dom/network/tests/marionette/test_mobile_roaming_preference.js => dom/mobileconnection/tests/marionette/test_mobile_roaming_preference.js rename : dom/network/tests/marionette/test_mobile_set_radio.js => dom/mobileconnection/tests/marionette/test_mobile_set_radio.js rename : dom/network/tests/marionette/test_mobile_voice_state.js => dom/mobileconnection/tests/marionette/test_mobile_voice_state.js
dothq · Dec 24, 2013 · f7411e4 · f7411e4
1 parent ca043f4
commit f7411e4
Show file tree

Hide file tree

Showing 30 changed files with 48 additions and 18 deletions.
diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
@@ -166,6 +166,7 @@
 @BINPATH@/components/dom_icc.xpt
 @BINPATH@/components/dom_cellbroadcast.xpt
 @BINPATH@/components/dom_wappush.xpt
+@BINPATH@/components/dom_mobileconnection.xpt
 #endif
 #ifdef MOZ_B2G_BT
 @BINPATH@/components/dom_bluetooth.xpt

diff --git a/dom/mobileconnection/interfaces/moz.build b/dom/mobileconnection/interfaces/moz.build
@@ -0,0 +1,12 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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/.
+
+XPIDL_SOURCES += [
+    'nsIDOMMobileConnection.idl',
+    'nsIMobileConnectionProvider.idl',
+]
+
+XPIDL_MODULE = 'dom_mobileconnection'
diff --git a/...ork/interfaces/nsIDOMMobileConnection.idl → ...ion/interfaces/nsIDOMMobileConnection.idl b/...ork/interfaces/nsIDOMMobileConnection.idl → ...ion/interfaces/nsIDOMMobileConnection.idl
diff --git a/...nterfaces/nsIMobileConnectionProvider.idl → ...nterfaces/nsIMobileConnectionProvider.idl b/...nterfaces/nsIMobileConnectionProvider.idl → ...nterfaces/nsIMobileConnectionProvider.idl
diff --git a/dom/mobileconnection/moz.build b/dom/mobileconnection/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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/.
+
+PARALLEL_DIRS += ['interfaces', 'src']
diff --git a/dom/network/src/MobileConnection.cpp → ...mobileconnection/src/MobileConnection.cpp b/dom/network/src/MobileConnection.cpp → ...mobileconnection/src/MobileConnection.cpp
diff --git a/dom/network/src/MobileConnection.h → dom/mobileconnection/src/MobileConnection.h b/dom/network/src/MobileConnection.h → dom/mobileconnection/src/MobileConnection.h
diff --git a/dom/network/src/MobileConnectionArray.cpp → ...econnection/src/MobileConnectionArray.cpp b/dom/network/src/MobileConnectionArray.cpp → ...econnection/src/MobileConnectionArray.cpp
diff --git a/dom/network/src/MobileConnectionArray.h → ...ileconnection/src/MobileConnectionArray.h b/dom/network/src/MobileConnectionArray.h → ...ileconnection/src/MobileConnectionArray.h
diff --git a/dom/mobileconnection/src/moz.build b/dom/mobileconnection/src/moz.build
@@ -0,0 +1,25 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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/.
+
+EXPORTS.mozilla.dom.network += [
+    'MobileConnection.h',
+    'MobileConnectionArray.h',
+]
+
+SOURCES += [
+    'MobileConnection.cpp',
+    'MobileConnectionArray.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'gklayout'
+
+LOCAL_INCLUDES += [
+    '/dom/events',
+]
diff --git a/dom/network/tests/marionette/manifest.ini → ...econnection/tests/marionette/manifest.ini b/dom/network/tests/marionette/manifest.ini → ...econnection/tests/marionette/manifest.ini
diff --git a/...ette/test_call_barring_change_password.js → ...ette/test_call_barring_change_password.js b/...ette/test_call_barring_change_password.js → ...ette/test_call_barring_change_password.js
diff --git a/...arionette/test_call_barring_get_option.js → ...arionette/test_call_barring_get_option.js b/...arionette/test_call_barring_get_option.js → ...arionette/test_call_barring_get_option.js
diff --git a/...marionette/test_call_barring_set_error.js → ...marionette/test_call_barring_set_error.js b/...marionette/test_call_barring_set_error.js → ...marionette/test_call_barring_set_error.js
diff --git a/...marionette/test_mobile_data_connection.js → ...marionette/test_mobile_data_connection.js b/...marionette/test_mobile_data_connection.js → ...marionette/test_mobile_data_connection.js
diff --git a/...s/marionette/test_mobile_data_location.js → ...s/marionette/test_mobile_data_location.js b/...s/marionette/test_mobile_data_location.js → ...s/marionette/test_mobile_data_location.js
diff --git a/...ests/marionette/test_mobile_data_state.js → ...ests/marionette/test_mobile_data_state.js b/...ests/marionette/test_mobile_data_state.js → ...ests/marionette/test_mobile_data_state.js
diff --git a/...ionette/test_mobile_last_known_network.js → ...ionette/test_mobile_last_known_network.js b/...ionette/test_mobile_last_known_network.js → ...ionette/test_mobile_last_known_network.js
diff --git a/...twork/tests/marionette/test_mobile_mmi.js → ...ction/tests/marionette/test_mobile_mmi.js b/...twork/tests/marionette/test_mobile_mmi.js → ...ction/tests/marionette/test_mobile_mmi.js
diff --git a/.../tests/marionette/test_mobile_networks.js → .../tests/marionette/test_mobile_networks.js b/.../tests/marionette/test_mobile_networks.js → .../tests/marionette/test_mobile_networks.js
diff --git a/.../marionette/test_mobile_operator_names.js → .../marionette/test_mobile_operator_names.js b/.../marionette/test_mobile_operator_names.js → .../marionette/test_mobile_operator_names.js
diff --git a/...tte/test_mobile_preferred_network_type.js → ...tte/test_mobile_preferred_network_type.js b/...tte/test_mobile_preferred_network_type.js → ...tte/test_mobile_preferred_network_type.js
diff --git a/...bile_preferred_network_type_by_setting.js → ...bile_preferred_network_type_by_setting.js b/...bile_preferred_network_type_by_setting.js → ...bile_preferred_network_type_by_setting.js
diff --git a/...ionette/test_mobile_roaming_preference.js → ...ionette/test_mobile_roaming_preference.js b/...ionette/test_mobile_roaming_preference.js → ...ionette/test_mobile_roaming_preference.js
diff --git a/...tests/marionette/test_mobile_set_radio.js → ...tests/marionette/test_mobile_set_radio.js b/...tests/marionette/test_mobile_set_radio.js → ...tests/marionette/test_mobile_set_radio.js
diff --git a/...sts/marionette/test_mobile_voice_state.js → ...sts/marionette/test_mobile_voice_state.js b/...sts/marionette/test_mobile_voice_state.js → ...sts/marionette/test_mobile_voice_state.js
diff --git a/dom/moz.build b/dom/moz.build
@@ -95,6 +95,7 @@ if CONFIG['MOZ_B2G_RIL']:
     PARALLEL_DIRS += [
         'icc',
         'cellbroadcast',
+        'mobileconnection',
         'voicemail',
         'wappush',
     ]

diff --git a/dom/network/interfaces/moz.build b/dom/network/interfaces/moz.build
@@ -15,12 +15,6 @@ XPIDL_SOURCES += [
     'nsIUDPSocketChild.idl',
 ]
 
-if CONFIG['MOZ_B2G_RIL']:
-    XPIDL_SOURCES += [
-        'nsIDOMMobileConnection.idl',
-        'nsIMobileConnectionProvider.idl',
-    ]
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     XPIDL_SOURCES += [
         'nsIDOMNetworkStats.idl',

diff --git a/dom/network/src/moz.build b/dom/network/src/moz.build
@@ -26,16 +26,6 @@ UNIFIED_SOURCES += [
     'UDPSocketParent.cpp',
 ]
 
-if CONFIG['MOZ_B2G_RIL']:
-    EXPORTS.mozilla.dom.network += [
-        'MobileConnection.h',
-        'MobileConnectionArray.h',
-    ]
-    UNIFIED_SOURCES += [
-        'MobileConnection.cpp',
-        'MobileConnectionArray.cpp',
-    ]
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXTRA_JS_MODULES = [
         'NetworkStatsDB.jsm',
@@ -71,7 +61,7 @@ FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
+
 LOCAL_INCLUDES += [
     '/dom/events',
 ]
-
diff --git a/testing/marionette/client/marionette/tests/unit-tests.ini b/testing/marionette/client/marionette/tests/unit-tests.ini
@@ -20,7 +20,7 @@ skip = false
 [include:../../../../../dom/voicemail/test/marionette/manifest.ini]
 [include:../../../../../dom/battery/test/marionette/manifest.ini]
 [include:../../../../../dom/mobilemessage/tests/marionette/manifest.ini]
-[include:../../../../../dom/network/tests/marionette/manifest.ini]
+[include:../../../../../dom/mobileconnection/tests/marionette/manifest.ini]
 [include:../../../../../dom/system/gonk/tests/marionette/manifest.ini]
 [include:../../../../../dom/icc/tests/marionette/manifest.ini]
 [include:../../../../../dom/system/tests/marionette/manifest.ini]