Generating .aar and .so file via CMakeList

To avoid recompiling the source in test cases. Now we are generating .so file while building the .aar file. For this we have created buildLinuxBinding task which dependsOn build target. As now test/CMakeList is unused so we have removed it.

Author: MohitMaliFtechiz

lib/build.gradle

@@ -328,4 +328,11 @@ String getLibzimFiles() {
             "${projectDir}/src/main/java/org/kiwix/libzim/SuggestionSearcher.java " +
             "${projectDir}/src/main/java/org/kiwix/libzim/SuggestionSearch.java " +
             "${projectDir}/src/main/java/org/kiwix/libzim/ZimFileFormatException.java"
-}
+}
+
+task buildLinuxBinding(type: Exec) {
+    workingDir "${projectDir}/src/main/cpp/"
+    commandLine 'bash', '-c', "cmake . -B ${buildDir} && make -C ${buildDir}"
+}
+
+build.dependsOn buildLinuxBinding

lib/src/main/cpp/CMakeLists.txt

@@ -2,12 +2,23 @@
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
 cmake_minimum_required(VERSION 3.18.1)
 
-set(CMAKE_ANDROID_STL_TYPE llvm-libc++_static)
-
 project("libkiwix_wrapper")
 
-add_library(
-        zim_wrapper
+set(BUILD_DIR_PATH "${BUILD_DIR}")
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        set(BUILD_DIR_PATH "./../../../build")
+endif ()
+
+include_directories(
+        ${CMAKE_SOURCE_DIR}
+        ${BUILD_DIR_PATH}/include/libkiwix
+        ${BUILD_DIR_PATH}/include/libzim
+        ${BUILD_DIR_PATH}/include/javah_generated
+        #${CMAKE_SOURCE_DIR}/include/utils
+)
+
+add_library(zim_wrapper
 
         SHARED
         libzim/archive.cpp
@@ -25,24 +36,8 @@ add_library(
         libzim/suggestion_item.cpp
 )
 
-find_library(libzim
-        zim
-        PATHS
-        ${BUILD_DIR}/jniLibs/${CMAKE_ANDROID_ARCH_ABI}/libzim)
-if (NOT libzim)
-        message(FATAL_ERROR "libzim not found!")
-endif()
-add_library(libzim SHARED IMPORTED)
-
-set_property(TARGET
-        libzim
-        PROPERTY
-        IMPORTED_LOCATION
-        ${BUILD_DIR}/jniLibs/${CMAKE_ANDROID_ARCH_ABI}/libzim/libzim.so)
 
-
-add_library(
-        kiwix_wrapper
+add_library(kiwix_wrapper
 
         SHARED
         libkiwix/book.cpp
@@ -55,43 +50,82 @@ add_library(
         libkiwix/illustration.cpp
 )
 
-find_library(libkiwix
-        kiwix
-        PATHS
-        ${BUILD_DIR}/jniLibs/${CMAKE_ANDROID_ARCH_ABI}/libkiwix)
-if (NOT libkiwix)
-        message(FATAL_ERROR "libkiwix not found!")
-endif()
-add_library(libkiwix SHARED IMPORTED)
-
-set_property(TARGET
-        libkiwix
-        PROPERTY
-        IMPORTED_LOCATION
-        ${BUILD_DIR}/jniLibs/${CMAKE_ANDROID_ARCH_ABI}/libkiwix/libkiwix.so)
+# Linux target
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 
-include_directories(
-${CMAKE_SOURCE_DIR}
-${BUILD_DIR}/include/libkiwix
-${BUILD_DIR}/include/libzim
-${BUILD_DIR}/include/javah_generated
-#${CMAKE_SOURCE_DIR}/include/utils
-)
+        find_package(JNI)
+
+        include_directories(
+                ${JNI_INCLUDE_DIRS}
+        )
 
-find_library(
-        log-lib
-        log)
+        add_library(libzim SHARED IMPORTED)
+        set_target_properties(libzim PROPERTIES IMPORTED_LOCATION libzim.so)
 
-target_link_libraries(
-        zim_wrapper
-        libzim
-        ${log-lib}
-)
+        add_library(libkiwix SHARED IMPORTED)
+        set_target_properties(libkiwix PROPERTIES IMPORTED_LOCATION libkiwix.so)
 
-target_link_libraries(
-        kiwix_wrapper
-        libkiwix
-        libzim
-        ${log-lib}
+        target_link_libraries(
+                zim_wrapper
+                libzim
         )
 
+        target_link_libraries(
+                kiwix_wrapper
+                libkiwix
+                libzim
+        )
+endif ()
+
+# Android target
+if (ANDROID)
+        set(CMAKE_ANDROID_STL_TYPE llvm-libc++_static)
+
+        find_library(
+                log-lib
+                log)
+
+        find_library(libzim
+                zim
+                PATHS
+                ${BUILD_DIR_PATH}/jniLibs/${CMAKE_ANDROID_ARCH_ABI}/libzim)
+        if (NOT libzim)
+                message(FATAL_ERROR "libzim not found!")
+        endif ()
+        add_library(libzim SHARED IMPORTED)
+
+        set_property(TARGET
+                libzim
+                PROPERTY
+                IMPORTED_LOCATION
+                ${BUILD_DIR_PATH}/jniLibs/${CMAKE_ANDROID_ARCH_ABI}/libzim/libzim.so)
+
+
+        find_library(libkiwix
+                kiwix
+                PATHS
+                ${BUILD_DIR_PATH}/jniLibs/${CMAKE_ANDROID_ARCH_ABI}/libkiwix)
+        if (NOT libkiwix)
+                message(FATAL_ERROR "libkiwix not found!")
+        endif ()
+        add_library(libkiwix SHARED IMPORTED)
+
+        set_property(TARGET
+                libkiwix
+                PROPERTY
+                IMPORTED_LOCATION
+                ${BUILD_DIR_PATH}/jniLibs/${CMAKE_ANDROID_ARCH_ABI}/libkiwix/libkiwix.so)
+
+        target_link_libraries(
+                zim_wrapper
+                libzim
+                ${log-lib}
+        )
+
+        target_link_libraries(
+                kiwix_wrapper
+                libkiwix
+                libzim
+                ${log-lib}
+        )
+endif ()

lib/src/test/CMakeLists.txt

@@ -12,7 +12,8 @@ public class test {
     static {
         System.loadLibrary("kiwix");
         System.loadLibrary("zim");
-        System.loadLibrary("buildkiwix");
+        System.loadLibrary("kiwix_wrapper");
+        System.loadLibrary("zim_wrapper");
     }
 
     private static byte[] getFileContent(String path)