android: Fix compilation error for Android 4.2.2

On our current target the tools cannot be compiled.

diff --git a/android/Android.mk b/android/Android.mk
index bad5ebc..eef809a 100644 (file)
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -86,6 +86,8 @@ LOCAL_SRC_FILES := \
        client/if-bt.c \
        client/if-hh.c \
 
+LOCAL_CFLAGS := -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
+
 LOCAL_SHARED_LIBRARIES := libhardware
 
 LOCAL_MODULE_TAGS := optional

diff --git a/android/client/if-bt.c b/android/client/if-bt.c
index 5f88a64..01bf1d1 100644 (file)
--- a/android/client/if-bt.c
+++ b/android/client/if-bt.c
@@ -364,11 +364,13 @@ static void dut_mode_recv_cb(uint16_t opcode, uint8_t *buf, uint8_t len)
        haltest_info("%s\n", __func__);
 }
 
+#if PLATFORM_SDK_VERSION > 17
 static void le_test_mode_cb(bt_status_t status, uint16_t num_packets)
 {
        haltest_info("%s %s %d\n", __func__, bt_state_t2str(status),
                                                                num_packets);
 }
+#endif
 
 static bt_callbacks_t bt_callbacks = {
        .size = sizeof(bt_callbacks),
@@ -383,7 +385,9 @@ static bt_callbacks_t bt_callbacks = {
        .acl_state_changed_cb = acl_state_changed_cb,
        .thread_evt_cb = thread_evt_cb,
        .dut_mode_recv_cb = dut_mode_recv_cb,
+#if PLATFORM_SDK_VERSION > 17
        .le_test_mode_cb = le_test_mode_cb
+#endif
 };
 
 static void init_p(int argc, const char **argv)
@@ -808,8 +812,10 @@ static void get_profile_interface_p(int argc, const char **argv)
                pif = (const void **)&if_hh;
        else if (strcmp(BT_PROFILE_PAN_ID, id) == 0)
                pif = &dummy; /* TODO: change when if_pan is there */
+#if PLATFORM_SDK_VERSION > 17
        else if (strcmp(BT_PROFILE_AV_RC_ID, id) == 0)
                pif = &dummy; /* TODO: change when if_rc is there */
+#endif
        else
                haltest_error("%s is not correct for get_profile_interface\n",
                     id);

diff --git a/android/client/if-main.h b/android/client/if-main.h
index f8430cf..21fdcfe 100644 (file)
--- a/android/client/if-main.h
+++ b/android/client/if-main.h
@@ -35,7 +35,10 @@
 #include <hardware/bt_sock.h>
 #include <hardware/bt_hf.h>
 #include <hardware/bt_hl.h>
+
+#if PLATFORM_SDK_VERSION > 17
 #include <hardware/bt_rc.h>
+#endif
 
 #include "textconv.h"
 

diff --git a/android/client/textconv.c b/android/client/textconv.c
index de7e23c..1188477 100644 (file)
--- a/android/client/textconv.c
+++ b/android/client/textconv.c
@@ -94,7 +94,9 @@ INTMAP(bt_property_type_t, -1, "(unknown)")
        DELEMENT(BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT),
        DELEMENT(BT_PROPERTY_REMOTE_FRIENDLY_NAME),
        DELEMENT(BT_PROPERTY_REMOTE_RSSI),
+#if PLATFORM_SDK_VERSION > 17
        DELEMENT(BT_PROPERTY_REMOTE_VERSION_INFO),
+#endif
        DELEMENT(BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP),
 ENDMAP