fixups

Author: CastagnaIT

CMakeLists.txt

@@ -63,6 +63,7 @@ include_directories(${INCLUDES}
                     ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways (becomes done in future)
                     ${NLOHMANNJSON_INCLUDE_DIRS}
                     ${LIBANDROIDJNI_INCLUDE_DIRS}
+                    $<$<STREQUAL:${CORE_SYSTEM_NAME},android>:${LIBANDROIDJNI_INCLUDE_DIRS}>
                     src/
 )
 
@@ -79,9 +80,12 @@ list(APPEND DEPLIBS ${PUGIXML_LIBRARIES}
                     ${BENTO4_LIBRARIES}
                     mpegts
                     webm_parser
-                    ${LIBANDROIDJNI_LIBRARIES}
 )
 
+if(CORE_SYSTEM_NAME STREQUAL android)
+  list(APPEND DEPLIBS ${LIBANDROIDJNI_LIBRARIES})
+endif()
+
 # Add additional dependencies
 get_property(DEPS_FOLDERS_LIST GLOBAL PROPERTY GlobalDepsFoldersList)
 foreach(DEP_FOLDER ${DEPS_FOLDERS_LIST})

FindLibAndroidJNI.cmake

@@ -9,6 +9,6 @@ find_path(LIBANDROIDJNI_INCLUDE_DIRS include/androidjni)
 find_library(LIBANDROIDJNI_LIBRARIES androidjni)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(androidjni REQUIRED_VARS LIBANDROIDJNI_INCLUDE_DIRS LIBANDROIDJNI_LIBRARIES)
+find_package_handle_standard_args(LibAndroidJNI REQUIRED_VARS LIBANDROIDJNI_INCLUDE_DIRS LIBANDROIDJNI_LIBRARIES)
 
 mark_as_advanced(LIBANDROIDJNI_INCLUDE_DIRS LIBANDROIDJNI_LIBRARIES)

depends/android/libandroidjni/libandroidjni.sha256

@@ -1 +1 @@
-fb7db4a7a1d56199c1ddea7178d46bf5b55f3af4ab23f19ef54bb10e03067043
+18b43677838865ecf9bd331bbbe81541d36784d720b72445f9e2230addd83a80

depends/android/libandroidjni/libandroidjni.txt

@@ -1 +1 @@
-libandroidjni https://github.com/CastagnaIT/libandroidjni/archive/22a3e0ecdc1336a55440fe37285bc337d6c4566e.tar.gz
+libandroidjni https://github.com/CastagnaIT/libandroidjni/archive/993a880aa562d7c331c09ea827c029f75d2480b3.tar.gz