[*] Android fixes

3rdparty/json-c/CMakeLists.txt

+cmake_minimum_required(VERSION 2.8)
+project (json-c)
+  
+file(GLOB JSON_C_SRCS FILES *.c)
+file(GLOB JSON_C_HEADERS FILES *.h)
+
+add_library(${PROJECT_NAME} STATIC ${JSON_C_SRCS} ${JSON_C_HEADERS})
+target_include_directories(json-c PUBLIC . )

CMakeLists.txt

@@ -32,6 +32,12 @@ endif()
 add_subdirectory(dap-sdk)
 add_subdirectory(3rdparty/monero_crypto)
 add_subdirectory(3rdparty/cuttdb)
+if (ANDROID)
+    add_subdirectory(3rdparty/libmagic)
+    add_subdirectory(3rdparty/json-c)
+    include_directories(cellframe-sdk/3rdparty/)
+
+endif()
 add_subdirectory(modules/)
 
 add_library(${PROJECT_NAME} STATIC cellframe-sdk.c)

cmake/OS_Detection.cmake

@@ -12,7 +12,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
     set(ANDROID ON)
     set(UNIX ON)
-    set(LINUX ON)
+    set(LINUX OFF)
     set(OS_TYPE_MOBILE ON)
     message("[*] ANDROID build")
     add_definitions(-DANDROID -DDAP_OS_ANDROID)
@@ -69,13 +69,6 @@ if(UNIX)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_CCOPT}")
     set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} ${_LOPT}")
 
-    if (ANDROID)
-      add_subdirectory(lib/json-c)
-      add_subdirectory(lib/sqlite3)
-      #add_subdirectory(lib/libev)
-      include_directories(lib/)
-    else()
-    endif(ANDROID)
 endif()
 
 if(WIN32)

dap-sdk/net/server/CMakeLists.txt

 project(libdap-server C)
 cmake_minimum_required(VERSION 3.0)
 
-if (ANDROID)
-    add_subdirectory(../../../3rdparty/libmagic)
-endif()
 
 add_subdirectory(http_server)
 add_subdirectory(enc_server)