From 163ec9f74300991450165a71cac24f49e5f0cc82 Mon Sep 17 00:00:00 2001
From: fuzzard <fuzzard@kodi.tv>
Date: Sun, 17 Apr 2022 19:40:00 +1000
Subject: [cmake] build libandroidjni as cmake dependency

dont use tools/depends for libandroidjni. build via cmake find module as
a required_platform_dep
---
 cmake/modules/FindLibAndroidJNI.cmake | 37 +++++++++++++++++++++++++++++++++++
 cmake/platform/android/android.cmake  |  2 +-
 cmake/scripts/android/ArchSetup.cmake |  2 +-
 tools/depends/target/Makefile         |  2 +-
 4 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 cmake/modules/FindLibAndroidJNI.cmake

diff --git a/cmake/modules/FindLibAndroidJNI.cmake b/cmake/modules/FindLibAndroidJNI.cmake
new file mode 100644
index 0000000000..a779d9d6e9
--- /dev/null
+++ b/cmake/modules/FindLibAndroidJNI.cmake
@@ -0,0 +1,37 @@
+# FindLibAndroidJNI
+# -------
+# Finds the LibAndroidJNI library
+#
+# This will define the following variables::
+#
+# LIBANDROIDJNI_FOUND - system has LibAndroidJNI
+# LIBANDROIDJNI_INCLUDE_DIRS - the LibAndroidJNI include directory
+# LIBANDROIDJNI_LIBRARIES - the LibAndroidJNI libraries
+#
+# and the following imported targets::
+#
+#   libandroidjni   - The LibAndroidJNI library
+
+include(cmake/scripts/common/ModuleHelpers.cmake)
+
+set(MODULE_LC libandroidjni)
+
+SETUP_BUILD_VARS()
+
+set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
+               -DCMAKE_BUILD_TYPE=Release)
+
+BUILD_DEP_TARGET()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LibAndroidJNI
+                                  REQUIRED_VARS LIBANDROIDJNI_LIBRARY LIBANDROIDJNI_INCLUDE_DIR
+                                  VERSION_VAR LIBANDROIDJNI_VER)
+
+if(LIBANDROIDJNI_FOUND)
+  set(LIBANDROIDJNI_LIBRARIES ${LIBANDROIDJNI_LIBRARY})
+  set(LIBANDROIDJNI_INCLUDE_DIRS ${LIBANDROIDJNI_INCLUDE_DIR})
+
+  set_property(GLOBAL APPEND PROPERTY INTERNAL_DEPS_PROP libandroidjni)
+endif()
+mark_as_advanced(LIBANDROIDJNI_INCLUDE_DIR LIBANDROIDJNI_LIBRARY)
diff --git a/cmake/platform/android/android.cmake b/cmake/platform/android/android.cmake
index 1450d2816b..7e3300426d 100644
--- a/cmake/platform/android/android.cmake
+++ b/cmake/platform/android/android.cmake
@@ -1,2 +1,2 @@
-set(PLATFORM_REQUIRED_DEPS OpenGLES EGL Zip)
+set(PLATFORM_REQUIRED_DEPS LibAndroidJNI OpenGLES EGL Zip)
 set(APP_RENDER_SYSTEM gles)
diff --git a/cmake/scripts/android/ArchSetup.cmake b/cmake/scripts/android/ArchSetup.cmake
index 1e529de05d..2fe85fe2f7 100644
--- a/cmake/scripts/android/ArchSetup.cmake
+++ b/cmake/scripts/android/ArchSetup.cmake
@@ -42,4 +42,4 @@ set(ENABLE_X11 OFF CACHE BOOL "" FORCE)
 set(ENABLE_OPTICAL OFF CACHE BOOL "" FORCE)
 set(ENABLE_MDNS OFF CACHE BOOL "" FORCE)
 
-list(APPEND DEPLIBS android log jnigraphics mediandk androidjni)
+list(APPEND DEPLIBS android log jnigraphics mediandk)
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index abf0fc08d2..9e3f969bf9 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -85,7 +85,7 @@ endif
 
 ifeq ($(OS),android)
   EXCLUDED_DEPENDS = libcec libusb gtest
-  DEPENDS += dummy-libxbmc libuuid libandroidjni libzip
+  DEPENDS += dummy-libxbmc libuuid libzip
   PYMODULE_DEPS = dummy-libxbmc
   LIBUUID = libuuid
 endif
-- 
cgit v1.2.3