Diff between 63c3679a819205b03b2e8f9ab3d641eccc7f5aaf and 5619f854f9f6d60d9bb8f361fe0d8e111ea6c92f

Changed Files

File Additions Deletions Status
android/Android.mk +2 -1 modified
android/main.c +6 -0 modified

Full Patch

diff --git a/android/Android.mk b/android/Android.mk
index 542c8f4..dd9c36d 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -38,7 +38,8 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/../src \
 	$(LOCAL_PATH)/../lib \
 
-LOCAL_CFLAGS := -DVERSION=\"$(BLUEZ_VERSION)\"
+LOCAL_CFLAGS := -DVERSION=\"$(BLUEZ_VERSION)\" \
+	-DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
 
 LOCAL_SHARED_LIBRARIES := \
 	libglib \
diff --git a/android/main.c b/android/main.c
index 57b9bba..1721df8 100644
--- a/android/main.c
+++ b/android/main.c
@@ -54,6 +54,12 @@
 #include "hal-msg.h"
 #include "ipc.h"
 
+/* TODO: Consider to remove PLATFORM_SDKVERSION check if requirement
+*  for minimal Android platform version increases. */
+#if defined(ANDROID) && PLATFORM_SDK_VERSION >= 18
+#include <sys/capability.h>
+#endif
+
 static GMainLoop *event_loop;
 static struct mgmt *mgmt_if = NULL;