-
Notifications
You must be signed in to change notification settings - Fork 161
Support for 16KB page sizes #69
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
Conversation
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.
Thanks Rami, added few comments.
README.md
Outdated
@@ -1,5 +1,5 @@ | |||
# Android OpenSSL support for Qt | |||
OpenSSL scripts and binaries for Android (useful for Qt Android apps) | |||
OpenSSL scripts and binaries for Android - useful with Qt for Android apps. |
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 think 'for' fits better than 'with' here: "..., useful for Qt Android apps"
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.
Thx for the comment. The "Qt for Android" is coming from the Qt documentation terminology https://doc.qt.io/qt-6/android.html, so would like to keep that. Re-phrased sentence a bit shorter and simpler for next version.
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.
Within #70
This patch adds needed linker flags for FFmpeg Android compilation to get FFmpeg binary to be compliant for 16KB page size. 16KB page size is compliant with 4KB page size. This patch updates Android OpenSSL to be version 3.0.7, which is build with two NDK's: NDK27c and NDK29-beta2. Both with 16KB page size support. They are build with KDAB/android_openssl#69 just changing OpenSSL version from 3.1.1 to 3.0.7 and NDK version from 25.2.9519653 to 27.2.12479018 (27c) and another build with 29.0.13599879 (beta2). The both build artefacts are added to CI-files to be usable. As the 16KB page size is applicable only to 64-bit ABI's this patch adds the variable to 90-install-ffmpeg.sh files for android-x86_64 and android-arm64. Change is picked to all branches using Android 15 or newer as Android 15 introduced the 16KB page size support. Fixes: QTBUG-139762 Pick-to: 6.10 6.9 6.8 6.5 Change-Id: I50bab81b97dad3e9d8c1e834c1928949d1e19687 Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
This patch adds needed linker flags for FFmpeg Android compilation to get FFmpeg binary to be compliant for 16KB page size. 16KB page size is compliant with 4KB page size. This patch updates Android OpenSSL to be version 3.0.7, which is build with two NDK's: NDK27c and NDK29-beta2. Both with 16KB page size support. They are build with KDAB/android_openssl#69 just changing OpenSSL version from 3.1.1 to 3.0.7 and NDK version from 25.2.9519653 to 27.2.12479018 (27c) and another build with 29.0.13599879 (beta2). The both build artefacts are added to CI-files to be usable. As the 16KB page size is applicable only to 64-bit ABI's this patch adds the variable to 90-install-ffmpeg.sh files for android-x86_64 and android-arm64. Change is picked to all branches using Android 15 or newer as Android 15 introduced the 16KB page size support. Fixes: QTBUG-139762 Pick-to: 6.9 6.8 6.5 Change-Id: I50bab81b97dad3e9d8c1e834c1928949d1e19687 Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io> (cherry picked from commit 875297e) Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
There is 16kB page size support by default in OpenSSL since 3.6 as per openssl/openssl#28277, maybe it would make more sense to update from 3.1 to 3.6 for this? Alternatively just pull in the tiny oneliner patch from that PR and add it to the Line 141 in 0025bbe
|
OpenSSL 3.6 was released just recently, the builds in this repo are used also for Qt versions like 6.5 and I haven't really tested that yet, so this could be done separately and not under this PR.
@vimpostor which PR you refer to? |
This patch adds the linker flags for the 64-bit ABI's to build 16KB page size binaries. It does not distinct OpenSSL versions, as 16KB page sizes are compliant with 4KB page sizes. Resolves KDAB#68
Support building it with 16KB page sizes. Changes to build script build_ssl.sh, fine tuning to README.md and updated binaries