ViSP Android module

cmake/android/ViSPDetectAndroidSDK.cmake

@@ -15,9 +15,7 @@ set(__msg_BUILD_ANDROID_PROJECTS "Use BUILD_ANDROID_PROJECTS=OFF to prepare Andr
 
 macro(vp_detect_android_sdk)
   if(NOT DEFINED ANDROID_SDK)
-    if(DEFINED ANDROID_SDK AND EXISTS "${ANDROID_SDK}")
-      set(ANDROID_SDK "${ANDROID_SDK}" CACHE INTERNAL "Android SDK path")
-      elseif(DEFINED ANDROID_HOME AND EXISTS "${ANDROID_HOME}")
+    if(DEFINED ANDROID_HOME AND EXISTS "${ANDROID_HOME}")
       set(ANDROID_SDK "${ANDROID_HOME}" CACHE INTERNAL "Android SDK path")
     elseif(DEFINED ANDROID_SDK_ROOT AND EXISTS "${ANDROID_SDK_ROOT}")
       set(ANDROID_SDK "${ANDROID_SDK_ROOT}" CACHE INTERNAL "Android SDK path")
@@ -39,10 +37,14 @@ macro(vp_detect_android_sdk_tools)
   if(NOT DEFINED ANDROID_SDK_TOOLS)
     if(DEFINED ANDROID_SDK AND EXISTS "${ANDROID_SDK}/tools")
       set(ANDROID_SDK_TOOLS "${ANDROID_SDK}/tools" CACHE INTERNAL "Android SDK Tools path")
+      set(ANDROID_SDK_TOOLS_TYPE "LEGACY")
+    elseif(DEFINED ANDROID_SDK AND EXISTS "${ANDROID_SDK}/cmdline-tools/latest")
+      set(ANDROID_SDK_TOOLS "${ANDROID_SDK}/cmdline-tools/latest" CACHE INTERNAL "Android SDK Tools path")
+      set(ANDROID_SDK_TOOLS_TYPE "CMDLINE")
+    else()
+      message(FATAL_ERROR "Android SDK Tools: can't automatically find Android SDK Tools. Specify path via ANDROID_SDK_TOOLS variable")
     endif()
-  endif()
-  if(NOT DEFINED ANDROID_SDK_TOOLS)
-    message(FATAL_ERROR "Android SDK Tools: can't automatically find Android SDK Tools. Specify path via ANDROID_SDK_TOOLS variable")
+    message(STATUS "ANDROID_SDK_TOOLS_TYPE is ${ANDROID_SDK_TOOLS_TYPE}")
   endif()
   if(NOT EXISTS "${ANDROID_SDK_TOOLS}")
     message(FATAL_ERROR "Android SDK Tools: specified path doesn't exist: ${ANDROID_SDK_TOOLS}")
@@ -159,21 +161,26 @@ if(BUILD_ANDROID_PROJECTS)
                         "${__msg_BUILD_ANDROID_PROJECTS}")
   endif()
 
-  if(NOT ANDROID_SDK_TOOLS_VERSION VERSION_LESS 25.3.0)
-    message(STATUS "Android SDK Tools: Ant (Eclipse) builds are NOT supported by Android SDK")
-    vp_update(ANDROID_PROJECTS_SUPPORT_ANT OFF)
-    if(NOT ANDROID_SDK_BUILD_TOOLS_VERSION VERSION_LESS 26.0.2)
-      # https://developer.android.com/studio/releases/gradle-plugin.html
-      message(STATUS "Android SDK Build Tools: Gradle 3.0.0+ builds support is available")
-      vp_update(ANDROID_PROJECTS_SUPPORT_GRADLE ON)
-    endif()
-  else()
-    include(${CMAKE_CURRENT_LIST_DIR}/../VISPDetectApacheAnt.cmake)
-    if(ANT_EXECUTABLE AND NOT ANT_VERSION VERSION_LESS 1.7)
-      message(STATUS "Android SDK Tools: Ant (Eclipse) builds are supported")
-      vp_update(ANDROID_PROJECTS_SUPPORT_ANT ON)
+  if(ANDROID_SDK_TOOLS_TYPE STREQUAL "LEGACY")
+    if(NOT ANDROID_SDK_TOOLS_VERSION VERSION_LESS 25.3.0)
+      message(STATUS "Android SDK Tools: Ant (Eclipse) builds are NOT supported by Android SDK")
+      vp_update(ANDROID_PROJECTS_SUPPORT_ANT OFF)
+      if(NOT ANDROID_SDK_BUILD_TOOLS_VERSION VERSION_LESS 26.0.2)
+        # https://developer.android.com/studio/releases/gradle-plugin.html
+        message(STATUS "Android SDK Build Tools: Gradle 3.0.0+ builds support is available")
+        vp_update(ANDROID_PROJECTS_SUPPORT_GRADLE ON)
+      endif()
+    else()
+      include(${CMAKE_CURRENT_LIST_DIR}/../VISPDetectApacheAnt.cmake)
+      if(ANT_EXECUTABLE AND NOT ANT_VERSION VERSION_LESS 1.7)
+        message(STATUS "Android SDK Tools: Ant (Eclipse) builds are supported")
+        vp_update(ANDROID_PROJECTS_SUPPORT_ANT ON)
+      endif()
     endif()
-  endif()
+  elseif(ANDROID_SDK_TOOLS_TYPE STREQUAL "CMDLINE")
+    message(STATUS "Android SDK Command-Line Build Tools: Gradle 3.0.0+ builds support is available")
+    vp_update(ANDROID_PROJECTS_SUPPORT_GRADLE ON)
+  endif(ANDROID_SDK_TOOLS_TYPE)
 
   if(NOT DEFINED ANDROID_PROJECTS_BUILD_TYPE)
     if(ANDROID_PROJECTS_SUPPORT_ANT)
@@ -184,7 +191,7 @@ if(BUILD_ANDROID_PROJECTS)
       message(FATAL_ERROR "Android SDK: Can't build Android projects as requested by BUILD_ANDROID_PROJECTS=ON variable.\n"
                           "${__msg_BUILD_ANDROID_PROJECTS}")
     endif()
-  endif()
+  endif(ANDROID_PROJECTS_BUILD_TYPE)
 
   if(ANDROID_PROJECTS_BUILD_TYPE STREQUAL "ANT")
     message(STATUS "Android SDK Tools: Prepare Android projects for using Ant build scripts (deprecated)")

cmake/android/android_gradle_projects.cmake

@@ -5,9 +5,9 @@ message(STATUS "Android Gradle Plugin version: ${ANDROID_GRADLE_PLUGIN_VERSION}"
 set(GRADLE_VERSION "5.6.4" CACHE STRING "Gradle version")
 message(STATUS "Gradle version: ${GRADLE_VERSION}")
 
-set(ANDROID_COMPILE_SDK_VERSION "26" CACHE STRING "Android compileSdkVersion")
+set(ANDROID_COMPILE_SDK_VERSION "33" CACHE STRING "Android compileSdkVersion")
 set(ANDROID_MIN_SDK_VERSION "21" CACHE STRING "Android minSdkVersion")
-set(ANDROID_TARGET_SDK_VERSION "26" CACHE STRING "Android minSdkVersion")
+set(ANDROID_TARGET_SDK_VERSION "33" CACHE STRING "Android target Sdk Version")
 
 set(ANDROID_BUILD_BASE_DIR "${VISP_BINARY_DIR}/visp_android" CACHE INTERNAL "")
 set(ANDROID_TMP_INSTALL_BASE_DIR "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/install/visp_android")
@@ -30,16 +30,14 @@ if(NOT INSTALL_CREATE_DISTRIB)
   set(ANDROID_INSTALL_ABI_FILTER "${ANDROID_BUILD_ABI_FILTER}")
 endif()
 
+file(WRITE "${VISP_BINARY_DIR}/root_android.txt" "${ANDROID_BUILD_BASE_DIR}")
+
 # BUG: Ninja generator generates broken targets with ANDROID_ABI_FILTER name (CMake 3.11.2)
 #set(__spaces "                        ")
 #string(REPLACE "\n" "\n${__spaces}" ANDROID_ABI_FILTER "${__spaces}${ANDROID_BUILD_ABI_FILTER}")
 #string(REPLACE REGEX "[ ]+$" "" ANDROID_ABI_FILTER "${ANDROID_ABI_FILTER}")
-set(ANDROID_ABI_FILTER "${ANDROID_BUILD_ABI_FILTER}")
-configure_file("${VISP_SOURCE_DIR}/samples/android/build.gradle.in" "${ANDROID_BUILD_BASE_DIR}/build.gradle" @ONLY)
 
 set(ANDROID_ABI_FILTER "${ANDROID_INSTALL_ABI_FILTER}")
-configure_file("${VISP_SOURCE_DIR}/samples/android/build.gradle.in" "${ANDROID_TMP_INSTALL_BASE_DIR}/${ANDROID_INSTALL_SAMPLES_DIR}/build.gradle" @ONLY)
-install(FILES "${ANDROID_TMP_INSTALL_BASE_DIR}/${ANDROID_INSTALL_SAMPLES_DIR}/build.gradle" DESTINATION "${ANDROID_INSTALL_SAMPLES_DIR}" COMPONENT samples)
 
 configure_file("${VISP_SOURCE_DIR}/platforms/android/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties.in" "${ANDROID_BUILD_BASE_DIR}/gradle/wrapper/gradle-wrapper.properties" @ONLY)
 install(FILES "${ANDROID_BUILD_BASE_DIR}/gradle/wrapper/gradle-wrapper.properties" DESTINATION "${ANDROID_INSTALL_SAMPLES_DIR}/gradle/wrapper" COMPONENT samples)
@@ -65,20 +63,8 @@ foreach(fname ${GRADLE_WRAPPER_FILES})
   install(FILES "${VISP_SOURCE_DIR}/platforms/android/gradle-wrapper/${fname}" DESTINATION "${ANDROID_INSTALL_SAMPLES_DIR}/${__dir}" COMPONENT samples ${__permissions})
 endforeach()
 
-file(WRITE "${ANDROID_BUILD_BASE_DIR}/settings.gradle" "
-include ':visp'
-")
-
-file(WRITE "${ANDROID_TMP_INSTALL_BASE_DIR}/settings.gradle" "
-rootProject.name = 'visp_samples'
-
-def vispsdk='../'
-//def vispsdk='/<path to ViSP-android-sdk>'
-//println vispsdk
-include ':visp'
-project(':visp').projectDir = new File(vispsdk + '/sdk')
-")
-
+file(WRITE "${ANDROID_BUILD_BASE_DIR}/local.properties" "sdk.dir=${ANDROID_SDK}")
+file(WRITE "${ANDROID_TMP_INSTALL_BASE_DIR}/local.properties" "sdk.dir=${ANDROID_SDK}")
 
 macro(add_android_project target path)
   get_filename_component(__dir "${path}" NAME)
@@ -107,8 +93,29 @@ macro(add_android_project target path)
   configure_file("${path}/build.gradle.in" "${ANDROID_BUILD_BASE_DIR}/${__dir}/build.gradle" @ONLY)
 
   file(APPEND "${ANDROID_BUILD_BASE_DIR}/settings.gradle" "
-include ':${__dir}'
-")
+  pluginManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex(\"com\\\\.android.*\")
+                includeGroupByRegex(\"com\\\\.google.*\")
+                includeGroupByRegex(\"androidx.*\")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+  }
+  dependencyResolutionManagement {
+      repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+      repositories {
+          google()
+          mavenCentral()
+      }
+  }
+
+  include ':${__dir}'
+  ")
 
   if (BUILD_ANDROID_EXAMPLES)
     # build apk
@@ -160,9 +167,7 @@ include ':${__dir}'
   install(FILES "${ANDROID_TMP_INSTALL_BASE_DIR}/${__dir}/build.gradle" DESTINATION "${ANDROID_INSTALL_SAMPLES_DIR}/${__dir}" COMPONENT samples)
 
   file(APPEND "${ANDROID_TMP_INSTALL_BASE_DIR}/settings.gradle" "
-include ':${__dir}'
-")
+  include ':${__dir}'
+  ")
 
 endmacro()
-
-install(FILES "${ANDROID_TMP_INSTALL_BASE_DIR}/settings.gradle" DESTINATION "${ANDROID_INSTALL_SAMPLES_DIR}" COMPONENT samples)