Merge pull request #24930 from asmorkalov:as/android_enable_native_aar

Enable Android samples with native part with AAR package
pull/25069/head
Alexander Smorkalov 9 months ago committed by GitHub
commit a024d9e996
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 13
      cmake/android/android_gradle_projects.cmake

@ -222,20 +222,9 @@ include ':${__dir}'
configure_file("${path}/build.gradle.in" "${ANDROID_TMP_INSTALL_BASE_DIR}/${__dir}/build.gradle" @ONLY) configure_file("${path}/build.gradle.in" "${ANDROID_TMP_INSTALL_BASE_DIR}/${__dir}/build.gradle" @ONLY)
install(FILES "${ANDROID_TMP_INSTALL_BASE_DIR}/${__dir}/build.gradle" DESTINATION "${ANDROID_INSTALL_SAMPLES_DIR}/${__dir}" COMPONENT samples) install(FILES "${ANDROID_TMP_INSTALL_BASE_DIR}/${__dir}/build.gradle" DESTINATION "${ANDROID_INSTALL_SAMPLES_DIR}/${__dir}" COMPONENT samples)
# HACK: AAR packages generated from current OpenCV project has incomple prefab part file(APPEND "${ANDROID_TMP_INSTALL_BASE_DIR}/settings.gradle" "
# and cannot be used for native linkage against OpenCV.
# Alternative way to build AAR: https://github.com/opencv/opencv/blob/4.x/platforms/android/build_java_shared_aar.py
if("${__dir}" STREQUAL "tutorial-2-mixedprocessing" OR "${__dir}" STREQUAL "tutorial-4-opencl")
file(APPEND "${ANDROID_TMP_INSTALL_BASE_DIR}/settings.gradle" "
if (gradle.opencv_source == 'sdk_path') {
include ':${__dir}'
}
")
else()
file(APPEND "${ANDROID_TMP_INSTALL_BASE_DIR}/settings.gradle" "
include ':${__dir}' include ':${__dir}'
") ")
endif()
endmacro() endmacro()

Loading…
Cancel
Save