Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android: Update Source Package #11233

Merged
merged 1 commit into from
Apr 13, 2024
Merged

Conversation

HTRamsey
Copy link
Collaborator

@HTRamsey HTRamsey commented Mar 11, 2024

This does a couple things (Tested on Android 14 OnePlus, it is the non-functionality changes from #11082 which I am changing to just focus on the Android Serial Implementation):

  • Creates a multi-abi apk for armv7 and arm64-v8a instead of building individually
  • Updates Gradle and AGP versions
  • Switches CI to use Java 17 which is required to use a AGP version that supports sdk 34+.
  • Sets target sdk to 34.
  • Fixes ANDROID_VERSION_NAME in qmake build
  • Fixes package name, this should be set in gradle using namespace instead of AndroidManifest.xml package for now on (There was a deprecation warning).
  • Moves android initialization code into its own file in AndroidInit.cpp, cleaning up the main file of platform dependent code a bit.
  • Removes two obsolete android tools, as these values can be set by user variables in the build instead of manually changing afterwards. These variables can be set either through build system variables or variables set in gradle.properties or gradle.settings, so future custom builds should make use of that functionality instead.
  • Includes an android USB fix that is required from android 14 onwards
  • Adds back the gradle files, which allow various extra customization settings rather than using default Qt ones.

Note: We might be able to leave out the gradlew stuff if we want

Edit: Removed deployment changes for a separate PR, this now just focuses on updating the android package content

@HTRamsey HTRamsey changed the title Update Android Package Android: Update Source Package Mar 11, 2024
@HTRamsey HTRamsey force-pushed the dev-android branch 5 times, most recently from dce0aed to 072f5e0 Compare March 15, 2024 12:18
Copy link
Contributor

@julianoes julianoes left a comment

Choose a reason for hiding this comment

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

Very nice!

I assume the version str still works, even after you removed that update_android_version.sh script?

@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.qtproject.example"
package="org.mavlink.qgroundcontrol"
Copy link
Contributor

Choose a reason for hiding this comment

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

😄

@HTRamsey HTRamsey marked this pull request as draft April 5, 2024 09:52
@HTRamsey
Copy link
Collaborator Author

HTRamsey commented Apr 5, 2024

I still need to add the logic to set the CMake variable for version string based on daily/release but it will do the exact same thing the tools did.

@DonLakeFlyer DonLakeFlyer reopened this Apr 6, 2024
This was referenced Apr 10, 2024
@HTRamsey HTRamsey force-pushed the dev-android branch 3 times, most recently from 2cb8669 to b0ec405 Compare April 10, 2024 12:58
@HTRamsey HTRamsey marked this pull request as ready for review April 10, 2024 13:00
@HTRamsey HTRamsey force-pushed the dev-android branch 2 times, most recently from 368dab2 to 149d0e2 Compare April 11, 2024 06:30
@HTRamsey HTRamsey force-pushed the dev-android branch 3 times, most recently from 5ae9a5f to ace0f20 Compare April 13, 2024 10:00
@HTRamsey HTRamsey merged commit de2bac7 into mavlink:master Apr 13, 2024
8 checks passed
@HTRamsey HTRamsey deleted the dev-android branch April 13, 2024 11:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants