diff --git a/cmake/android/android_gradle_projects.cmake b/cmake/android/android_gradle_projects.cmake index c595bee107..8204c0f920 100644 --- a/cmake/android/android_gradle_projects.cmake +++ b/cmake/android/android_gradle_projects.cmake @@ -1,7 +1,10 @@ # https://developer.android.com/studio/releases/gradle-plugin -set(ANDROID_GRADLE_PLUGIN_VERSION "3.2.1" CACHE STRING "Android Gradle Plugin version (3.0+)") +set(ANDROID_GRADLE_PLUGIN_VERSION "3.2.1" CACHE STRING "Android Gradle Plugin version") 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_MIN_SDK_VERSION "21" CACHE STRING "Android minSdkVersion") set(ANDROID_TARGET_SDK_VERSION "26" CACHE STRING "Android minSdkVersion") @@ -38,9 +41,11 @@ set(ANDROID_ABI_FILTER "${ANDROID_INSTALL_ABI_FILTER}") configure_file("${OpenCV_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("${OpenCV_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) + set(GRADLE_WRAPPER_FILES "gradle/wrapper/gradle-wrapper.jar" - "gradle/wrapper/gradle-wrapper.properties" "gradlew.bat" "gradlew" "gradle.properties" diff --git a/platforms/android/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties b/platforms/android/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties.in similarity index 87% rename from platforms/android/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties rename to platforms/android/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties.in index 0ebb3108e2..9084063bb0 100644 --- a/platforms/android/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties +++ b/platforms/android/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties.in @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-@GRADLE_VERSION@-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/platforms/android/ndk-22.config.py b/platforms/android/ndk-22.config.py new file mode 100644 index 0000000000..69321e0f0c --- /dev/null +++ b/platforms/android/ndk-22.config.py @@ -0,0 +1,6 @@ +ABIs = [ + ABI("2", "armeabi-v7a", None, cmake_vars=dict(ANDROID_ABI='armeabi-v7a with NEON', ANDROID_GRADLE_PLUGIN_VERSION='4.1.2', GRADLE_VERSION='6.5')), + ABI("3", "arm64-v8a", None, cmake_vars=dict(ANDROID_GRADLE_PLUGIN_VERSION='4.1.2', GRADLE_VERSION='6.5')), + ABI("5", "x86_64", None, cmake_vars=dict(ANDROID_GRADLE_PLUGIN_VERSION='4.1.2', GRADLE_VERSION='6.5')), + ABI("4", "x86", None, cmake_vars=dict(ANDROID_GRADLE_PLUGIN_VERSION='4.1.2', GRADLE_VERSION='6.5')), +]