1123077 - [Flatfish] build broken due to missing defines for Bluetooth

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Bluetooth, defect)

Description

[:gerard-majax]

In file included from ../../../gecko/dom/bluetooth/bluedroid/BluetoothA2dpHALInterface.cpp:8:0:
../../../gecko/dom/bluetooth/bluedroid/BluetoothHALHelpers.h: In function 'nsresult mozilla::dom::bluetooth::Convert(bt_property_type_t, mozilla::dom::bluetooth::BluetoothPropertyType&)':
../../../gecko/dom/bluetooth/bluedroid/BluetoothHALHelpers.h:201:6: error: 'BT_PROPERTY_REMOTE_VERSION_INFO' was not declared in this scope
     CONVERT(BT_PROPERTY_REMOTE_VERSION_INFO,PROPERTY_REMOTE_VERSION_INFO)
      ^
../../../gecko/dom/bluetooth/bluedroid/BluetoothHALHelpers.h:202:3: error: name used in a GNU-style designated initializer for an array

As far as I can say, the value BT_PROPERTY_REMOTE_VERSION_INFO do not exists in the <hardware/bluetooth.h> file used by Flatfish device.

Comment 1

[Thomas Zimmermann [:tzimmermann] [:tdz]]

I'll fix that, thanks for reporting. Flatfish is painful to work with. We had multiple such bugs.

Comment 2

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Need to fix some build problems first, I guess.

Comment 3

[:gerard-majax]

And this one too

Comment 5

[Shawn Huang [:shawnjohnjr][:shuang] (as a happy gecko contributor)]

This should fix the build break. BT_PROPERTY_REMOTE_VERSION_INFO is not defined in Android 4.2 (API level 17) but it appears in Android 4.3 (API level 18).

diff --git a/dom/bluetooth/bluedroid/BluetoothHALHelpers.h b/dom/bluetooth/bluedroid/BluetoothHALHelpers.h
index 4827f7f..b87e35e 100644
--- a/dom/bluetooth/bluedroid/BluetoothHALHelpers.h
+++ b/dom/bluetooth/bluedroid/BluetoothHALHelpers.h
@@ -198,7 +198,9 @@ Convert(bt_property_type_t aIn, BluetoothPropertyType& aOut)
       PROPERTY_ADAPTER_DISCOVERY_TIMEOUT),
     CONVERT(BT_PROPERTY_REMOTE_FRIENDLY_NAME, PROPERTY_REMOTE_FRIENDLY_NAME),
     CONVERT(BT_PROPERTY_REMOTE_RSSI, PROPERTY_REMOTE_RSSI),
+#if ANDROID_VERSION >= 18
     CONVERT(BT_PROPERTY_REMOTE_VERSION_INFO,PROPERTY_REMOTE_VERSION_INFO)
+#endif
   };

Comment 6

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Attachment: [01] Bug 1123077: Protect PROPERTY_REMOTE_VERSION_INFO by ANDROID_VERSION

Comment 7

[Bruce Sun [:brsun]]

Hi, trailing comma in enum might not be supported on old compiler, but trailing comma in array should be allowed at all time, right?

Comment 8

[Thomas Zimmermann [:tzimmermann] [:tdz]]

Thank you!

https://hg.mozilla.org/integration/b2g-inbound/rev/4d3548b9bceb

https://treeherder.mozilla.org/#/jobs?repo=b2g-inbound&revision=4d3548b9bceb

Comment 9

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/4d3548b9bceb