mirror of
https://github.com/opencv/opencv.git
synced 2025-06-11 03:33:28 +08:00
c803aa2ddd
Android builds update #26057 Fixes https://github.com/opencv/opencv/issues/26027 Should also address https://github.com/opencv/opencv/issues/26542 Changes: - Switched to Android build tools 34, NDK 26d, target API level 34 (required by Google Play). - Use flexible page size on Android by default to support Android 15+. - Dummy stub for R and BuildConfig classes for javadoc. - Java 17 everywhere. - Strict ndkVersion and ABI list in release package. Related: - Docker: https://github.com/opencv-infrastructure/opencv-gha-dockerfile/pull/41 - Pipeline: https://github.com/opencv/ci-gha-workflow/pull/183 Related IPP issue with NDK 27+: https://github.com/opencv/opencv/issues/26072 Google documentation for 16kb pages support : https://developer.android.com/guide/practices/page-sizes?hl=en ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake
31 lines
1.0 KiB
CMake
31 lines
1.0 KiB
CMake
cmake_minimum_required(VERSION 3.6)
|
|
|
|
set(target mixed_sample)
|
|
project(${target} CXX)
|
|
|
|
if (OPENCV_FROM_SDK)
|
|
message(STATUS "Using OpenCV from local SDK")
|
|
set(ANDROID_OPENCV_COMPONENTS "opencv_java" CACHE STRING "")
|
|
else()
|
|
message(STATUS "Using OpenCV from AAR (Maven repo)")
|
|
set(ANDROID_OPENCV_COMPONENTS "OpenCV::opencv_java${OPENCV_VERSION_MAJOR}" CACHE STRING "")
|
|
endif()
|
|
|
|
message(STATUS "ANDROID_ABI=${ANDROID_ABI}")
|
|
find_package(OpenCV REQUIRED COMPONENTS ${ANDROID_OPENCV_COMPONENTS})
|
|
|
|
# For 16k pages support with NDK prior 27
|
|
# Details: https://developer.android.com/guide/practices/page-sizes?hl=en
|
|
if(ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES)
|
|
if(ANDROID_ABI STREQUAL arm64-v8a OR ANDROID_ABI STREQUAL x86_64)
|
|
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=16384")
|
|
endif()
|
|
endif()
|
|
|
|
file(GLOB srcs *.cpp *.c)
|
|
file(GLOB hdrs *.hpp *.h)
|
|
|
|
include_directories("${CMAKE_CURRENT_LIST_DIR}")
|
|
add_library(${target} SHARED ${srcs} ${hdrs})
|
|
target_link_libraries(${target} ${ANDROID_OPENCV_COMPONENTS})
|