Fix <version> header conflict

Author: John-He-928

android/Android.mk

@@ -18,7 +18,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := wcdb
 LOCAL_CFLAGS := $(common_cflags)
 LOCAL_CPPFLAGS := $(commom_cppflags)
-LOCAL_C_INCLUDES := $(common_c_includes) $(root_path)
+LOCAL_C_INCLUDES := $(common_c_includes)
 LOCAL_SRC_FILES := \
 	$(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/*.c)) \
 	$(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/*.cpp))
@@ -44,6 +44,7 @@ LOCAL_MODULE := wcdb-repair
 LOCAL_CFLAGS := $(common_cflags)
 LOCAL_CPPFLAGS := $(commom_cppflags)
 LOCAL_C_INCLUDES := $(common_c_includes)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SRC_FILES := \
 	$(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/*.c)) \
 	$(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/*.cpp))
@@ -56,6 +57,7 @@ LOCAL_MODULE := wcdb-backup
 LOCAL_CFLAGS := $(common_cflags)
 LOCAL_CPPFLAGS := $(commom_cppflags)
 LOCAL_C_INCLUDES := $(common_c_includes)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SRC_FILES := \
 	$(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/*.c)) \
 	$(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/*.cpp))
@@ -68,6 +70,7 @@ LOCAL_MODULE := wcdb-icucompat
 LOCAL_CFLAGS := $(common_cflags)
 LOCAL_CPPFLAGS := $(commom_cppflags)
 LOCAL_C_INCLUDES := $(common_c_includes)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SRC_FILES := \
 	$(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/*.c)) \
 	$(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/*.cpp))
@@ -80,6 +83,7 @@ LOCAL_MODULE := wcdb-fts
 LOCAL_CFLAGS := $(common_cflags)
 LOCAL_CPPFLAGS := $(commom_cppflags)
 LOCAL_C_INCLUDES := $(common_c_includes)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SRC_FILES := \
 	$(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/*.c)) \
 	$(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/*.cpp))
@@ -92,6 +96,7 @@ LOCAL_MODULE := wcdb-vfslog
 LOCAL_CFLAGS := $(common_cflags)
 LOCAL_CPPFLAGS := $(commom_cppflags)
 LOCAL_C_INCLUDES := $(common_c_includes)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_SRC_FILES := \
 	$(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/*.c)) \
 	$(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/*.cpp))

android/jni/com_tencent_wcdb_database_SQLiteDebug.cpp

@@ -27,7 +27,7 @@
 #include "Logger.h"
 #include "ModuleLoader.h"
 #include "SQLiteCommon.h"
-#include <vfslog/vfslog.h>
+#include <vfslog.h>
 
 namespace wcdb {
 

android/jni/com_tencent_wcdb_extension_fts_MMFtsTokenizer.cpp

@@ -21,7 +21,7 @@
 #include <jni.h>
 #include "JNIHelp.h"
 #include "SQLiteCommon.h"
-#include "fts/mm_fts.h"
+#include <mm_fts.h>
 #include "ModuleLoader.h"
 
 SQLITE_EXTENSION_INIT3

android/jni/com_tencent_wcdb_repair_Backup.cpp

@@ -21,7 +21,7 @@
 #include "JNIHelp.h"
 #include "Logger.h"
 #include "ModuleLoader.h"
-#include <backup/mm_backup.h>
+#include <mm_backup.h>
 #include <jni.h>
 #include <stdlib.h>
 #include <sys/time.h>

android/jni/com_tencent_wcdb_repair_RepairKit.cpp

@@ -22,7 +22,7 @@
 #include "Logger.h"
 #include "ModuleLoader.h"
 #include <jni.h>
-#include <repair/SQLiteRepairKit.h>
+#include <SQLiteRepairKit.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>