Bug 1146355: Move Bluetooth legacy interface into sub-directory bluetooth1/, r=joliu

--HG--
rename : dom/bluetooth/BluetoothAdapter.cpp => dom/bluetooth/bluetooth1/BluetoothAdapter.cpp
rename : dom/bluetooth/BluetoothAdapter.h => dom/bluetooth/bluetooth1/BluetoothAdapter.h
rename : dom/bluetooth/BluetoothCommon.h => dom/bluetooth/bluetooth1/BluetoothCommon.h
rename : dom/bluetooth/BluetoothDevice.cpp => dom/bluetooth/bluetooth1/BluetoothDevice.cpp
rename : dom/bluetooth/BluetoothDevice.h => dom/bluetooth/bluetooth1/BluetoothDevice.h
rename : dom/bluetooth/BluetoothHfpManagerBase.h => dom/bluetooth/bluetooth1/BluetoothHfpManagerBase.h
rename : dom/bluetooth/BluetoothHidManager.cpp => dom/bluetooth/bluetooth1/BluetoothHidManager.cpp
rename : dom/bluetooth/BluetoothHidManager.h => dom/bluetooth/bluetooth1/BluetoothHidManager.h
rename : dom/bluetooth/BluetoothInterface.cpp => dom/bluetooth/bluetooth1/BluetoothInterface.cpp
rename : dom/bluetooth/BluetoothInterface.h => dom/bluetooth/bluetooth1/BluetoothInterface.h
rename : dom/bluetooth/BluetoothInterfaceHelpers.cpp => dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.cpp
rename : dom/bluetooth/BluetoothInterfaceHelpers.h => dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.h
rename : dom/bluetooth/BluetoothManager.cpp => dom/bluetooth/bluetooth1/BluetoothManager.cpp
rename : dom/bluetooth/BluetoothManager.h => dom/bluetooth/bluetooth1/BluetoothManager.h
rename : dom/bluetooth/BluetoothProfileController.cpp => dom/bluetooth/bluetooth1/BluetoothProfileController.cpp
rename : dom/bluetooth/BluetoothProfileController.h => dom/bluetooth/bluetooth1/BluetoothProfileController.h
rename : dom/bluetooth/BluetoothProfileManagerBase.h => dom/bluetooth/bluetooth1/BluetoothProfileManagerBase.h
rename : dom/bluetooth/BluetoothPropertyContainer.cpp => dom/bluetooth/bluetooth1/BluetoothPropertyContainer.cpp
rename : dom/bluetooth/BluetoothPropertyContainer.h => dom/bluetooth/bluetooth1/BluetoothPropertyContainer.h
rename : dom/bluetooth/BluetoothReplyRunnable.cpp => dom/bluetooth/bluetooth1/BluetoothReplyRunnable.cpp
rename : dom/bluetooth/BluetoothReplyRunnable.h => dom/bluetooth/bluetooth1/BluetoothReplyRunnable.h
rename : dom/bluetooth/BluetoothRilListener.cpp => dom/bluetooth/bluetooth1/BluetoothRilListener.cpp
rename : dom/bluetooth/BluetoothRilListener.h => dom/bluetooth/bluetooth1/BluetoothRilListener.h
rename : dom/bluetooth/BluetoothService.cpp => dom/bluetooth/bluetooth1/BluetoothService.cpp
rename : dom/bluetooth/BluetoothService.h => dom/bluetooth/bluetooth1/BluetoothService.h
rename : dom/bluetooth/BluetoothSocketObserver.h => dom/bluetooth/bluetooth1/BluetoothSocketObserver.h
rename : dom/bluetooth/BluetoothUtils.cpp => dom/bluetooth/bluetooth1/BluetoothUtils.cpp
rename : dom/bluetooth/BluetoothUtils.h => dom/bluetooth/bluetooth1/BluetoothUtils.h
rename : dom/bluetooth/BluetoothUuid.cpp => dom/bluetooth/bluetooth1/BluetoothUuid.cpp
rename : dom/bluetooth/BluetoothUuid.h => dom/bluetooth/bluetooth1/BluetoothUuid.h
rename : dom/bluetooth/ObexBase.cpp => dom/bluetooth/bluetooth1/ObexBase.cpp
rename : dom/bluetooth/ObexBase.h => dom/bluetooth/bluetooth1/ObexBase.h
rename : dom/bluetooth/ipc/BluetoothChild.cpp => dom/bluetooth/bluetooth1/ipc/BluetoothChild.cpp
rename : dom/bluetooth/ipc/BluetoothChild.h => dom/bluetooth/bluetooth1/ipc/BluetoothChild.h
rename : dom/bluetooth/ipc/BluetoothMessageUtils.h => dom/bluetooth/bluetooth1/ipc/BluetoothMessageUtils.h
rename : dom/bluetooth/ipc/BluetoothParent.cpp => dom/bluetooth/bluetooth1/ipc/BluetoothParent.cpp
rename : dom/bluetooth/ipc/BluetoothParent.h => dom/bluetooth/bluetooth1/ipc/BluetoothParent.h
rename : dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp => dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.cpp
rename : dom/bluetooth/ipc/BluetoothServiceChildProcess.h => dom/bluetooth/bluetooth1/ipc/BluetoothServiceChildProcess.h
rename : dom/bluetooth/ipc/BluetoothTypes.ipdlh => dom/bluetooth/bluetooth1/ipc/BluetoothTypes.ipdlh
rename : dom/bluetooth/ipc/PBluetooth.ipdl => dom/bluetooth/bluetooth1/ipc/PBluetooth.ipdl
rename : dom/bluetooth/ipc/PBluetoothRequest.ipdl => dom/bluetooth/bluetooth1/ipc/PBluetoothRequest.ipdl
rename : dom/bluetooth/tests/marionette/head.js => dom/bluetooth/bluetooth1/tests/marionette/head.js
rename : dom/bluetooth/tests/marionette/manifest.ini => dom/bluetooth/bluetooth1/tests/marionette/manifest.ini
rename : dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_discovery.js => dom/bluetooth/bluetooth1/tests/marionette/test_dom_BluetoothAdapter_discovery.js
rename : dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_getters.js => dom/bluetooth/bluetooth1/tests/marionette/test_dom_BluetoothAdapter_getters.js
rename : dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_pair.js => dom/bluetooth/bluetooth1/tests/marionette/test_dom_BluetoothAdapter_pair.js
rename : dom/bluetooth/tests/marionette/test_dom_BluetoothAdapter_setters.js => dom/bluetooth/bluetooth1/tests/marionette/test_dom_BluetoothAdapter_setters.js
rename : dom/bluetooth/tests/marionette/test_dom_BluetoothManager_adapteradded.js => dom/bluetooth/bluetooth1/tests/marionette/test_dom_BluetoothManager_adapteradded.js
rename : dom/bluetooth/tests/marionette/test_dom_BluetoothManager_enabled.js => dom/bluetooth/bluetooth1/tests/marionette/test_dom_BluetoothManager_enabled.js

dom/base/moz.build

@@ -398,6 +398,7 @@ MSVC_ENABLE_PGO = True
 LOCAL_INCLUDES += [
     '../battery',
     '../bluetooth',
+    '../bluetooth/bluetooth1',
     '../events',
     '../media',
     '../network',

dom/bindings/moz.build

@@ -44,6 +44,7 @@ LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/battery',
     '/dom/bluetooth',
+    '/dom/bluetooth/bluetooth1',
     '/dom/camera',
     '/dom/canvas',
     '/dom/geolocation',

dom/bluetooth/moz.build

@@ -6,29 +6,34 @@
 
 if CONFIG['MOZ_B2G_BT']:
     SOURCES += [
-        'BluetoothAdapter.cpp',
-        'BluetoothDevice.cpp',
-        'BluetoothHidManager.cpp',
-        'BluetoothInterface.cpp',
-        'BluetoothInterfaceHelpers.cpp',
-        'BluetoothManager.cpp',
-        'BluetoothProfileController.cpp',
-        'BluetoothPropertyContainer.cpp',
-        'BluetoothReplyRunnable.cpp',
-        'BluetoothService.cpp',
-        'BluetoothUtils.cpp',
-        'BluetoothUuid.cpp',
-        'ipc/BluetoothChild.cpp',
-        'ipc/BluetoothParent.cpp',
-        'ipc/BluetoothServiceChildProcess.cpp',
-        'ObexBase.cpp'
+        'bluetooth1/BluetoothAdapter.cpp',
+        'bluetooth1/BluetoothDevice.cpp',
+        'bluetooth1/BluetoothHidManager.cpp',
+        'bluetooth1/BluetoothInterface.cpp',
+        'bluetooth1/BluetoothInterfaceHelpers.cpp',
+        'bluetooth1/BluetoothManager.cpp',
+        'bluetooth1/BluetoothProfileController.cpp',
+        'bluetooth1/BluetoothPropertyContainer.cpp',
+        'bluetooth1/BluetoothReplyRunnable.cpp',
+        'bluetooth1/BluetoothService.cpp',
+        'bluetooth1/BluetoothUtils.cpp',
+        'bluetooth1/BluetoothUuid.cpp',
+        'bluetooth1/ipc/BluetoothChild.cpp',
+        'bluetooth1/ipc/BluetoothParent.cpp',
+        'bluetooth1/ipc/BluetoothServiceChildProcess.cpp',
+        'bluetooth1/ObexBase.cpp'
     ]
 
     if CONFIG['MOZ_B2G_RIL']:
         SOURCES += [
-            'BluetoothRilListener.cpp',
+            'bluetooth1/BluetoothRilListener.cpp',
         ]
 
+    LOCAL_INCLUDES += [
+        'bluetooth1',
+        'bluetooth1/ipc',
+    ]
+
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
         if CONFIG['MOZ_B2G_BT_BLUEZ']:
             CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
@@ -104,25 +109,21 @@ if CONFIG['MOZ_B2G_BT']:
 
     FINAL_LIBRARY = 'xul'
 
-    LOCAL_INCLUDES += [
-        'ipc',
-    ]
-
 EXPORTS.mozilla.dom.bluetooth.ipc += [
-    'ipc/BluetoothMessageUtils.h',
+    'bluetooth1/ipc/BluetoothMessageUtils.h',
 ]
 
 EXPORTS.mozilla.dom.bluetooth += [
-    'BluetoothAdapter.h',
-    'BluetoothCommon.h',
-    'BluetoothDevice.h',
-    'BluetoothManager.h',
+    'bluetooth1/BluetoothAdapter.h',
+    'bluetooth1/BluetoothCommon.h',
+    'bluetooth1/BluetoothDevice.h',
+    'bluetooth1/BluetoothManager.h',
 ]
 
 IPDL_SOURCES += [
-    'ipc/BluetoothTypes.ipdlh',
-    'ipc/PBluetooth.ipdl',
-    'ipc/PBluetoothRequest.ipdl',
+    'bluetooth1/ipc/BluetoothTypes.ipdlh',
+    'bluetooth1/ipc/PBluetooth.ipdl',
+    'bluetooth1/ipc/PBluetoothRequest.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True

dom/ipc/moz.build

@@ -123,7 +123,8 @@ LOCAL_INCLUDES += [
     '/docshell/base',
     '/dom/base',
     '/dom/bluetooth',
-    '/dom/bluetooth/ipc',
+    '/dom/bluetooth/bluetooth1',
+    '/dom/bluetooth/bluetooth1/ipc',
     '/dom/devicestorage',
     '/dom/filesystem',
     '/dom/fmradio/ipc',

dom/system/gonk/moz.build

@@ -114,6 +114,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/bluetooth',
+    '/dom/bluetooth/bluetooth1',
     '/dom/geolocation',
     '/dom/wifi',
 ]

js/xpconnect/src/moz.build

@@ -74,4 +74,5 @@ LOCAL_INCLUDES += [
 if CONFIG['MOZ_B2G_BT']:
     LOCAL_INCLUDES += [
         '/dom/bluetooth',
+        '/dom/bluetooth/bluetooth1',
     ]

layout/build/moz.build

@@ -109,6 +109,7 @@ if CONFIG['MOZ_B2G_FM']:
 if CONFIG['MOZ_B2G_BT']:
     LOCAL_INCLUDES += [
         '/dom/bluetooth',
+        '/dom/bluetooth/bluetooth1',
     ]
 
 if CONFIG['MOZ_WEBSPEECH']:

testing/marionette/client/marionette/tests/webapi-tests.ini

@@ -12,7 +12,7 @@ b2g = true
 skip = false
 
 ; webapi tests
-[include:../../../../../dom/bluetooth/tests/marionette/manifest.ini]
+[include:../../../../../dom/bluetooth/bluetooth1/tests/marionette/manifest.ini]
 [include:../../../../../dom/telephony/test/marionette/manifest.ini]
 [include:../../../../../dom/voicemail/test/marionette/manifest.ini]
 [include:../../../../../dom/battery/test/marionette/manifest.ini]