=== modified file 'android/hybris/Android.mk'
--- android/hybris/Android.mk	2015-06-23 21:35:21 +0000
+++ android/hybris/Android.mk	2016-02-02 09:09:37 +0000
@@ -17,6 +17,10 @@
 
 LOCAL_CFLAGS += -std=gnu++0x
 
+ifeq ($(BOARD_HAS_GNSS_STATUS_CALLBACK),true)
+LOCAL_CFLAGS += -DBOARD_HAS_GNSS_STATUS_CALLBACK
+endif
+
 LOCAL_C_INCLUDES := \
 	$(UPAPI_PATH)/include \
 	$(UPAPI_PATH)/android/include

=== modified file 'android/hybris/event_loop.h'
--- android/hybris/event_loop.h	2013-02-05 07:46:29 +0000
+++ android/hybris/event_loop.h	2016-02-02 09:09:37 +0000
@@ -21,6 +21,10 @@
 #include <utils/Looper.h>
 #include <utils/threads.h>
 
+#if ANDROID_VERSION_MAJOR==5
+#include "android/looper.h"
+#endif
+
 namespace ubuntu
 {
 namespace application

=== modified file 'android/hybris/ubuntu_application_gps_for_hybris.cpp'
--- android/hybris/ubuntu_application_gps_for_hybris.cpp	2014-05-13 10:00:55 +0000
+++ android/hybris/ubuntu_application_gps_for_hybris.cpp	2016-02-02 09:09:37 +0000
@@ -175,6 +175,9 @@
     location_callback,
     status_callback,
     sv_status_callback,
+#ifdef BOARD_HAS_GNSS_STATUS_CALLBACK
+    NULL,
+#endif
     nmea_callback,
     set_capabilities_callback,
     acquire_wakelock_callback,