Bug 1193379 - Create dom/bluetooth/common/webapi folder. r=joliu

dom/base/moz.build

@@ -413,8 +413,8 @@ FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../battery',
-    '../bluetooth',
     '../bluetooth/common',
+    '../bluetooth/common/webapi',
     '../events',
     '../media',
     '../network',

dom/bindings/moz.build

@@ -44,8 +44,7 @@ FAIL_ON_WARNINGS = True
 LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/battery',
-    '/dom/bluetooth',
-    '/dom/bluetooth/common',
+    '/dom/bluetooth/common/webapi',
     '/dom/camera',
     '/dom/canvas',
     '/dom/geolocation',

dom/bluetooth/bluedroid/BluetoothPbapManager.cpp

@@ -12,6 +12,7 @@
 #include "BluetoothUuid.h"
 #include "ObexBase.h"
 
+#include "mozilla/dom/File.h"
 #include "mozilla/dom/ipc/BlobParent.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/Services.h"

dom/bluetooth/common/BluetoothService.h

@@ -9,7 +9,6 @@
 
 #include "BluetoothCommon.h"
 #include "BluetoothInterface.h"
-#include "BluetoothPbapRequestHandle.h"
 #include "BluetoothProfileManagerBase.h"
 #include "nsAutoPtr.h"
 #include "nsClassHashtable.h"

dom/bluetooth/moz.build

@@ -16,35 +16,36 @@ if CONFIG['MOZ_B2G_BT']:
         ]
 
     SOURCES += [
-        'common/BluetoothAdapter.cpp',
-        'common/BluetoothClassOfDevice.cpp',
-        'common/BluetoothDevice.cpp',
-        'common/BluetoothDiscoveryHandle.cpp',
-        'common/BluetoothGatt.cpp',
-        'common/BluetoothGattCharacteristic.cpp',
-        'common/BluetoothGattDescriptor.cpp',
-        'common/BluetoothGattServer.cpp',
-        'common/BluetoothGattService.cpp',
         'common/BluetoothHidManager.cpp',
         'common/BluetoothInterface.cpp',
-        'common/BluetoothLeDeviceEvent.cpp',
-        'common/BluetoothManager.cpp',
-        'common/BluetoothPairingHandle.cpp',
-        'common/BluetoothPairingListener.cpp',
-        'common/BluetoothPbapRequestHandle.cpp',
         'common/BluetoothProfileController.cpp',
         'common/BluetoothReplyRunnable.cpp',
         'common/BluetoothService.cpp',
         'common/BluetoothUtils.cpp',
         'common/BluetoothUuid.cpp',
         'common/ObexBase.cpp',
+        'common/webapi/BluetoothAdapter.cpp',
+        'common/webapi/BluetoothClassOfDevice.cpp',
+        'common/webapi/BluetoothDevice.cpp',
+        'common/webapi/BluetoothDiscoveryHandle.cpp',
+        'common/webapi/BluetoothGatt.cpp',
+        'common/webapi/BluetoothGattCharacteristic.cpp',
+        'common/webapi/BluetoothGattDescriptor.cpp',
+        'common/webapi/BluetoothGattServer.cpp',
+        'common/webapi/BluetoothGattService.cpp',
+        'common/webapi/BluetoothLeDeviceEvent.cpp',
+        'common/webapi/BluetoothManager.cpp',
+        'common/webapi/BluetoothPairingHandle.cpp',
+        'common/webapi/BluetoothPairingListener.cpp',
+        'common/webapi/BluetoothPbapRequestHandle.cpp',
         'ipc/BluetoothChild.cpp',
         'ipc/BluetoothParent.cpp',
-        'ipc/BluetoothServiceChildProcess.cpp',
+        'ipc/BluetoothServiceChildProcess.cpp'
     ]
     LOCAL_INCLUDES += [
         'common',
-        'ipc',
+        'common/webapi',
+        'ipc'
     ]
 
     #
@@ -129,26 +130,26 @@ EXPORTS.mozilla.dom.bluetooth.ipc += [
     'ipc/BluetoothMessageUtils.h',
 ]
 EXPORTS.mozilla.dom.bluetooth += [
-    'common/BluetoothAdapter.h',
-    'common/BluetoothClassOfDevice.h',
     'common/BluetoothCommon.h',
-    'common/BluetoothDevice.h',
-    'common/BluetoothDiscoveryHandle.h',
-    'common/BluetoothGatt.h',
-    'common/BluetoothGattCharacteristic.h',
-    'common/BluetoothGattDescriptor.h',
-    'common/BluetoothGattServer.h',
-    'common/BluetoothGattService.h',
-    'common/BluetoothLeDeviceEvent.h',
-    'common/BluetoothManager.h',
-    'common/BluetoothPairingHandle.h',
-    'common/BluetoothPairingListener.h',
-    'common/BluetoothPbapRequestHandle.h',
+    'common/webapi/BluetoothAdapter.h',
+    'common/webapi/BluetoothClassOfDevice.h',
+    'common/webapi/BluetoothDevice.h',
+    'common/webapi/BluetoothDiscoveryHandle.h',
+    'common/webapi/BluetoothGatt.h',
+    'common/webapi/BluetoothGattCharacteristic.h',
+    'common/webapi/BluetoothGattDescriptor.h',
+    'common/webapi/BluetoothGattServer.h',
+    'common/webapi/BluetoothGattService.h',
+    'common/webapi/BluetoothLeDeviceEvent.h',
+    'common/webapi/BluetoothManager.h',
+    'common/webapi/BluetoothPairingHandle.h',
+    'common/webapi/BluetoothPairingListener.h',
+    'common/webapi/BluetoothPbapRequestHandle.h'
 ]
 IPDL_SOURCES += [
     'ipc/BluetoothTypes.ipdlh',
     'ipc/PBluetooth.ipdl',
-    'ipc/PBluetoothRequest.ipdl',
+    'ipc/PBluetoothRequest.ipdl'
 ]
 
 FAIL_ON_WARNINGS = True
@@ -156,7 +157,7 @@ FAIL_ON_WARNINGS = True
 LOCAL_INCLUDES += [
     '../base',
     '../network',
-    '../system/gonk',
+    '../system/gonk'
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')

dom/ipc/moz.build

@@ -128,7 +128,6 @@ LOCAL_INCLUDES += [
     '/chrome',
     '/docshell/base',
     '/dom/base',
-    '/dom/bluetooth',
     '/dom/bluetooth/common',
     '/dom/bluetooth/ipc',
     '/dom/devicestorage',

dom/system/gonk/moz.build

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

js/xpconnect/src/moz.build

@@ -72,6 +72,5 @@ LOCAL_INCLUDES += [
 
 if CONFIG['MOZ_B2G_BT']:
     LOCAL_INCLUDES += [
-        '/dom/bluetooth',
         '/dom/bluetooth/common',
     ]

layout/build/moz.build

@@ -106,7 +106,6 @@ if CONFIG['MOZ_B2G_FM']:
 
 if CONFIG['MOZ_B2G_BT']:
     LOCAL_INCLUDES += [
-        '/dom/bluetooth',
         '/dom/bluetooth/common',
     ]