Bug 1009347 - Patch 2/4: Using new bluetooth webidls based on bluetooth API version build flag, f=btian, r=bz, marcosc
authorJocelyn Liu <joliu@mozilla.com>
Wed, 21 May 2014 14:12:24 +0800
changeset 203373 71df0f6dface44353fb07c88aa23da4ab07eb412
parent 203372 7e5b760b4fdfbfa3ec7f51e9f521dd5c99e19093
child 203374 1d21153bfe47c95f7a90c20ef5b9cea50fb5a4f6
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, marcosc
bugs1009347
milestone32.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 1009347 - Patch 2/4: Using new bluetooth webidls based on bluetooth API version build flag, f=btian, r=bz, marcosc
dom/webidl/BluetoothAdapter2.webidl
dom/webidl/BluetoothDevice2.webidl
dom/webidl/BluetoothManager2.webidl
dom/webidl/moz.build
copy from dom/webidl/BluetoothAdapter.webidl
copy to dom/webidl/BluetoothAdapter2.webidl
copy from dom/webidl/BluetoothDevice.webidl
copy to dom/webidl/BluetoothDevice2.webidl
copy from dom/webidl/BluetoothManager.webidl
copy to dom/webidl/BluetoothManager2.webidl
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -538,21 +538,28 @@ WEBIDL_FILES += [
 ]
 
 # We only expose our prefable test interfaces in debug builds, just to be on
 # the safe side.
 if CONFIG['MOZ_DEBUG']:
     WEBIDL_FILES += ['TestInterfaceJS.webidl']
 
 if CONFIG['MOZ_B2G_BT']:
-    WEBIDL_FILES += [
-        'BluetoothAdapter.webidl',
-        'BluetoothDevice.webidl',
-        'BluetoothManager.webidl',
-    ]
+    if CONFIG['MOZ_B2G_BT_API_V2']:
+        WEBIDL_FILES += [
+            'BluetoothAdapter2.webidl',
+            'BluetoothDevice2.webidl',
+            'BluetoothManager2.webidl',
+        ]
+    else:
+        WEBIDL_FILES += [
+            'BluetoothAdapter.webidl',
+            'BluetoothDevice.webidl',
+            'BluetoothManager.webidl',
+        ]
 
 if CONFIG['MOZ_B2G_RIL']:
     WEBIDL_FILES += [
         'DOMMMIError.webidl',
         'IccCardLockError.webidl',
         'MozCellBroadcast.webidl',
         'MozCellBroadcastEvent.webidl',
         'MozIcc.webidl',