Android: don't require deprecated tools #21736
Conversation
|
Patch should not introduce regressions of used configurations. "Android armeabi-v7a" build has the following setup: (all of these dependencies are likely from 2018-2019) It would be nice if you could take a look how to support both configurations. |
…dle support by checking the Android SDK Build Tools version
dkurt
force-pushed
the
fix_android_sdk_tools_dependency
branch
from
87a1c13
to
fd69ea8
Compare
dkurt
changed the title
|
@asmorkalov, @opencv-alalek, please take a look at updated changes. |
| if(DEFINED ANDROID_SDK AND EXISTS "${ANDROID_SDK}/tools") | ||
| set(ANDROID_SDK_TOOLS "${ANDROID_SDK}/tools" CACHE INTERNAL "Android SDK Tools path") | ||
| if(DEFINED ANDROID_SDK) | ||
| if (EXISTS "${ANDROID_SDK}/cmdline-tools") |
There was a problem hiding this comment.
They are not the same and can't be exchanged. Just compare:
cmdline-tools/latest/source.properties:
Pkg.Revision=7.0
Pkg.Path=cmdline-tools;7.0
Pkg.Desc=Android SDK Command-line Tools
vs
tools/source.properties
Pkg.UserSrc=false
Pkg.Revision=26.1.1
Platform.MinPlatformToolsRev=20
Pkg.Dependencies=emulator
Pkg.Path=tools
Pkg.Desc=Android SDK Tools
OpenCV doesn't use "tools" with modern "gradle" flow actually. They are use with legacy "ant" build flow.
Try to comment out #ocv_detect_android_sdk_tools() call.
There was a problem hiding this comment.
Replaced to a simple check that tools found.
cmdline-tools tools changed their versioning so the latest one is 9.0. More about my build steps here: #23642
| @@ -173,12 +173,12 @@ if(BUILD_ANDROID_PROJECTS) | |||
| ocv_detect_android_sdk_tools() | |||
| ocv_detect_android_sdk_build_tools() | |||
|
|
|||
| if(ANDROID_SDK_TOOLS_VERSION VERSION_LESS 14) | |||
| if(DEFINED ANDROID_SDK_TOOLS_VERSION AND ANDROID_SDK_TOOLS_VERSION VERSION_LESS 14) | |||
There was a problem hiding this comment.
Please clean CMake cache and ensure that configuration process doesn't stop on the line 64.
There was a problem hiding this comment.
Thanks, sorry for confusion. My sdk contained both tools and cmdline-tools. Needed reinstall.
dkurt
force-pushed
the
fix_android_sdk_tools_dependency
branch
from
63bba9f
to
d7c613c
Compare
opencv-alalek
changed the title
…tools_dependency Android: don't require deprecated tools opencv#21736 Checking for these deprecated is no longer necessary, and infact broken on fresh Android SDK installs. Remove the check. resolves opencv#21735 ### 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
Checking for these deprecated is no longer necessary, and infact broken on fresh Android SDK installs. Remove the check.
resolves #21735
Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
Patch to opencv_extra has the same branch name.