2013-10-31 08:37:19

by Andrei Emeltchenko

Subject: [PATCH 1/2] android/haltest: Use Android system headers instead of local

From: Andrei Emeltchenko <[email protected]>

---
android/Android.mk | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/android/Android.mk b/android/Android.mk
index 3c4a825..e47f4a9 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -121,6 +121,10 @@ LOCAL_SRC_FILES := \
client/if-pan.c \
client/if-sock.c \

+LOCAL_C_INCLUDES += \
+ $(call include-path-for, system-core) \
+ $(call include-path-for, libhardware) \
+
LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)

LOCAL_SHARED_LIBRARIES := libhardware
--
1.7.10.4

2013-10-31 08:53:44

by Johan Hedberg

Subject: Re: [PATCH 1/2] android/haltest: Use Android system headers instead of local

Hi Andrei,

On Thu, Oct 31, 2013, Andrei Emeltchenko wrote:
> ---
> android/Android.mk | 4 ++++
> 1 file changed, 4 insertions(+)

Both patches have been applied. Thanks.

Johan

2013-10-31 08:37:20

by Andrei Emeltchenko

Subject: [PATCH 2/2] android/haltest: Fix bug when building for Android 4.2.2

From: Andrei Emeltchenko <[email protected]>

Since I started to use system Android headers instead of local this
bug was found.
---
android/client/if-bt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/client/if-bt.c b/android/client/if-bt.c
index cbb828b..f1410f7 100644
--- a/android/client/if-bt.c
+++ b/android/client/if-bt.c
@@ -679,10 +679,10 @@ static void get_profile_interface_c(int argc, const char **argv,
BT_PROFILE_SOCKETS_ID,
BT_PROFILE_HIDHOST_ID,
BT_PROFILE_PAN_ID,
-#if PLATFORM_SDK_VERSION >= 18
+#if PLATFORM_SDK_VERSION > 17
BT_PROFILE_GATT_ID,
-#endif
BT_PROFILE_AV_RC_ID,
+#endif
NULL
};

--
1.7.10.4