-
Notifications
You must be signed in to change notification settings - Fork 3.7k
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
Conversation
dce0aed
to
072f5e0
Compare
There was a problem hiding this 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" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
😄
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. |
2cb8669
to
b0ec405
Compare
368dab2
to
149d0e2
Compare
5ae9a5f
to
ace0f20
Compare
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 individuallyFixes ANDROID_VERSION_NAME in qmake buildMoves android initialization code into its own file in AndroidInit.cpp, cleaning up the main file of platform dependent code a bit.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