Update to support latest NDK version

Based on @mmosca PR changes I have also enable latest NDK
support.

Author: Personal

jni/Android.mk

@@ -7,7 +7,8 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 include $(PREBUILT_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS += -fPIC -std=c99 -O3
+LOCAL_CFLAGS += -fPIC -std=c99 -O3 -I.
+LOCAL_CXXFLAGS += -fPIC -std=c99 -O3 -I.
 LOCAL_LDFLAGS += -fPIC
 LOCAL_LDLIBS := -llog
 LOCAL_ARM_NEON := true
@@ -36,6 +37,8 @@ include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 
+LOCAL_CFLAGS += -fPIC -std=c99 -O3 -I. -DLZ4_STATIC_LINKING_ONLY
+LOCAL_CXXFLAGS += -fPIC -std=c99 -O3 -I.
 LOCAL_SRC_FILES:= \
 	hw/dji_radio_shm.c \
 	json/osd_config.c \

jni/hw/dji_display.c

@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include <string.h>
 #include "dji_display.h"
 #include "util/debug.h"
 

jni/hw/dji_radio_shm.c

@@ -1,4 +1,5 @@
 #include <assert.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/mman.h>

jni/lz4/lz4.c

@@ -114,7 +114,6 @@
 #define LZ4_DISABLE_DEPRECATE_WARNINGS /* due to LZ4_decompress_safe_withPrefix64k */
 #endif
 
-#define LZ4_STATIC_LINKING_ONLY  /* LZ4_DISTANCE_MAX */
 #include "lz4.h"
 /* see also "memory routines" below */
 

jni/util/fs_util.c

@@ -34,7 +34,7 @@ void *open_dict(int dict_version, int *size) {
     size_t filesize = st.st_size;
     int fd = open(file_path, O_RDONLY, 0);
     if (!fd) {
-        return -1;
+        return (void *)-1;
     }
     void* dict = malloc(filesize);
     void* mmappedData = mmap(NULL, filesize, PROT_READ, MAP_PRIVATE, fd, 0);

jni/util/vtx_manager.c

@@ -6,14 +6,17 @@
 #define CHANNEL_PUBLIC 8
 
 static void *tp1801_gui_lib = NULL;
-static uint32_t (* setChannelPilotOriginal)(void *this,unsigned short param_1, bool param_2) = 0;
+// static uint32_t (* setChannelPilotOriginal)(void *this,unsigned short param_1, bool param_2) = 0;
+// or
+static uint32_t (* setChannelPilotOriginal)(uint32_t this, unsigned short param_1, bool param_2) = 0;
 static uint32_t (* userSettingsGetInstanceOriginal)() = 0;
 static uint32_t userSettingsInstance = 0;
 static __gs_gui_config *gs_gui_config = 0;
 static int8_t currentChannel = -1;
 
 void setupVTXManager() {
     if(setChannelPilotOriginal != NULL)  {
+        //Already setup
         return;
     }