Linked libcurl with mear. Now working on refining and making things cleaner for authentication

app/src/main/cpp/CMakeLists.txt

@@ -11,8 +11,16 @@ cmake_minimum_required(VERSION 3.4.1)
 # Gradle automatically packages shared libraries with your APK.
 
 
+# set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+
+set (SOURCES
+        Demo.cpp
+        Tok.cpp
+        )
 set (HEADERS
         model/Song.h
+        model/User.h
+        Tok.h
         )
 
 set(JSON_BuildTests OFF CACHE INTERNAL "")
@@ -21,14 +29,11 @@ set(JSON_BuildTests OFF CACHE INTERNAL "")
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/json)
 
 
-add_library( # Sets the name of the library.
-             native-lib
-
-             # Sets the library as a shared library.
+add_library(native-lib
              SHARED
 
              # Provides a relative path to your source file(s).
-             Demo.cpp
+             ${SOURCES}
              ${HEADERS}
         )
 
@@ -46,24 +51,36 @@ find_library( # Sets the name of the path variable.
               # you want CMake to locate.
               log )
 
-message(${CMAKE_ANDROID_ARCH_ABI})
+# message(${CMAKE_ANDROID_ARCH_ABI})
 
-find_library( CPPUNIT_LIBRARY NAMES libcurl curl libcurl.a curl.a
-        HINTS
-        "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/android/armeabi-v7a"
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/android/
+set (CURL_LIBRARY
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/android/${ANDROID_ABI}
         )
 
+set (CURL_INCLUDE_DIR
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/android/include/curl
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/android/include
+        )
+
+add_library(boo STATIC IMPORTED)
+set_target_properties(boo PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/android/${ANDROID_ABI}/libcurl.a")
+#find_package(CURL REQUIRED)
+
+include_directories(${CURL_INCLUDE_DIR})
+
 # Specifies libraries CMake should link to your target library. You
 # can link multiple libraries, such as libraries you define in this
 # build script, prebuilt third-party libraries, or system libraries.
 
+#target_include_directories(native-lib PUBLIC ${CURL_INCLUDE_DIR})
 target_link_libraries( # Specifies the target library.
                        native-lib
         PRIVATE nlohmann_json::nlohmann_json
-        ${CPPUNIT_LIBRARY}
+        boo
+        #${CURL_LIBRARIES}
 
                        # Links the target library to the log library
                        # included in the NDK.
                        ${log-lib}
+        z
         )