Skip to content

Android AAR package build and test with CI#24554

Merged
asmorkalov merged 1 commit intoopencv:4.xfrom
asmorkalov:as/android_sdk_local_props
Nov 28, 2023
Merged

Android AAR package build and test with CI#24554
asmorkalov merged 1 commit intoopencv:4.xfrom
asmorkalov:as/android_sdk_local_props

Conversation

@asmorkalov
Copy link
Copy Markdown
Contributor

@asmorkalov asmorkalov commented Nov 17, 2023 •
edited
Loading

Pull Request Readiness Checklist

Related changes in CI pipelines: opencv/ci-gha-workflow#121

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • 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
  • The PR is proposed to the proper branch
  • 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

@asmorkalov asmorkalov added this to the 4.9.0 milestone Nov 17, 2023
@asmorkalov asmorkalov changed the title WIP: Support local.properties for Android AAR build and test on CI Android AAR package build and test with CI Nov 21, 2023
@asmorkalov asmorkalov force-pushed the as/android_sdk_local_props branch 4 times, most recently from 648d4c9 to 1f2b026 Compare November 22, 2023 16:20
@asmorkalov asmorkalov requested a review from mshabunin November 23, 2023 06:21
@asmorkalov asmorkalov force-pushed the as/android_sdk_local_props branch from 1f2b026 to 709822f Compare November 23, 2023 06:28
@asmorkalov
Copy link
Copy Markdown
Contributor Author

asmorkalov commented Nov 23, 2023 •
edited
Loading

@mshabunin could you take a look? I'll revert CI related changes after the review and before merge.

@asmorkalov asmorkalov added the CI/CD: GitHub Actions (GHA) Changes related to CI/CD pipelines (GitHub Actions) label Nov 24, 2023
mshabunin
mshabunin reviewed Nov 24, 2023
View reviewed changes
platforms/android/build_static_aar.py
@@ -224,6 +234,8 @@ def main(args):
parser.add_argument('--android_min_sdk', default="21")
parser.add_argument('--android_target_sdk', default="26")
Copy link
Copy Markdown
Contributor

@mshabunin mshabunin Nov 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe?

Suggested change
parser.add_argument('--android_target_sdk', default="26")
parser.add_argument('--android_target_sdk', default="31")

It would be really good to combine these two scripts into one to reduce duplication.

mshabunin
mshabunin reviewed Nov 24, 2023
View reviewed changes
@asmorkalov
AAR package build and test with CI
aa6b399 
- Use the same tools and plugins for SDK build and AAR build
- Added script to test Gradle-based samples against local maven repo
- Various local fixes and debug prints
@asmorkalov asmorkalov force-pushed the as/android_sdk_local_props branch from 709822f to aa6b399 Compare November 28, 2023 07:02
@asmorkalov asmorkalov merged commit 1c4f441 into opencv:4.x Nov 28, 2023
This was referenced Dec 4, 2023
Closed
Closed
Closed
@opencv-alalek opencv-alalek removed their request for review December 26, 2023 20:42
@asmorkalov asmorkalov mentioned this pull request Jan 19, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mshabunin mshabunin mshabunin left review comments

Assignees

@mshabunin mshabunin

Labels

CI/CD: GitHub Actions (GHA) Changes related to CI/CD pipelines (GitHub Actions) platform: android

Projects

None yet

Milestone

4.9.0

Development

Successfully merging this pull request may close these issues.

2 participants

@asmorkalov @mshabunin