Bug 939022 - BluetoothUtils for bluedroid. Patch 1/3: Move files, r=echou
authorBen Tian <btian@mozilla.com>
Mon, 16 Dec 2013 19:00:54 +0800
changeset 161724 4c67ed9a5cfe94520e5ccd5626ed72bf0d933496
parent 161723 5f575f4803837499180638576f60843a0ebbc6e9
child 161725 9177a8846a2b1408751bff6871a132e6d41872a4
push id3479
push userbtian@mozilla.com
push dateMon, 23 Dec 2013 07:32:45 +0000
treeherderb2g-inbound@cd09c472c326 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersechou
bugs939022
milestone29.0a1
Bug 939022 - BluetoothUtils for bluedroid. Patch 1/3: Move files, r=echou
dom/bluetooth/BluetoothUtils.cpp
dom/bluetooth/BluetoothUtils.h
dom/bluetooth/bluedroid/BluetoothUtils.cpp
dom/bluetooth/bluedroid/BluetoothUtils.h
dom/bluetooth/bluez/BluetoothUtils.cpp
dom/bluetooth/bluez/BluetoothUtils.h
dom/bluetooth/moz.build
rename from dom/bluetooth/BluetoothUtils.cpp
rename to dom/bluetooth/bluedroid/BluetoothUtils.cpp
rename from dom/bluetooth/BluetoothUtils.h
rename to dom/bluetooth/bluedroid/BluetoothUtils.h
copy from dom/bluetooth/BluetoothUtils.cpp
copy to dom/bluetooth/bluez/BluetoothUtils.cpp
copy from dom/bluetooth/BluetoothUtils.h
copy to dom/bluetooth/bluez/BluetoothUtils.h
--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@@ -11,17 +11,16 @@ if CONFIG['MOZ_B2G_BT']:
         'BluetoothAdapter.cpp',
         'BluetoothDevice.cpp',
         'BluetoothHidManager.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'
     ]
 
     if CONFIG['MOZ_B2G_RIL']:
@@ -32,31 +31,33 @@ if CONFIG['MOZ_B2G_BT']:
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
         if CONFIG['MOZ_B2G_BT_BLUEZ']:
             SOURCES += [
                 'bluez/BluetoothA2dpManager.cpp',
                 'bluez/BluetoothHfpManager.cpp',
                 'bluez/BluetoothOppManager.cpp',
                 'bluez/BluetoothSocket.cpp',
                 'bluez/BluetoothUnixSocketConnector.cpp',
+                'bluez/BluetoothUtils.cpp',
                 'bluez/gonk/BluetoothGonkService.cpp',
                 'bluez/linux/BluetoothDBusService.cpp',
             ]
             LOCAL_INCLUDES += [
                 'bluez',
                 'bluez/gonk',
                 'bluez/linux',
             ]
             DEFINES['MOZ_B2G_BT_BLUEZ'] = True
         elif CONFIG['MOZ_B2G_BT_BLUEDROID']:
             SOURCES += [
                 'bluedroid/BluetoothA2dpManager.cpp',
                 'bluedroid/BluetoothHfpManager.cpp',
                 'bluedroid/BluetoothOppManager.cpp',
                 'bluedroid/BluetoothSocket.cpp',
+                'bluedroid/BluetoothUtils.cpp',
                 'bluedroid/gonk/BluetoothServiceBluedroid.cpp',
             ]
             LOCAL_INCLUDES += [
                 'bluedroid',
                 'bluedroid/gonk',
             ]
             DEFINES['MOZ_B2G_BT_BLUEDROID'] = True
     elif CONFIG['MOZ_ENABLE_DBUS']: