diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2025-03-26 11:45:08 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2025-03-27 05:06:44 +0000 |
| commit | 469fe0b8c7f9d624702df47567187fb13e872b95 (patch) | |
| tree | f639b399e91e6e80eb46f9368575fd13cef4226b | |
| parent | 3ae6c97953d563c33ff630f259716b01b81aa531 (diff) | |
Android: Upgrade Android NDK to r27c6.8.3
- Upgrade Android NDK to r27c, similar to Qt base.
- Api level 35 is the new default.
- Remove the option mpopcnt for QT_COMPILER_FLAGS for arm64, because
this option does not apply to arm64 and errors with api-level of 35.
Task-number: PYSIDE-1612
Change-Id: Icf8f2853ba23fd7d4c83c275947efbee0a54198d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit d67635f611e8aa90a2d3e46ad8a611b91e5b6abf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9c0de6cad12cbaf68ab78b9935bc0359587d8486)
(cherry picked from commit 488b8b7f859cb5e632bca617b26073064360bf26)
| -rw-r--r-- | tools/cross_compile_android/android_utilities.py | 4 | ||||
| -rw-r--r-- | tools/cross_compile_android/main.py | 2 | ||||
| -rw-r--r-- | tools/cross_compile_android/templates/toolchain_default.tmpl.cmake | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/tools/cross_compile_android/android_utilities.py b/tools/cross_compile_android/android_utilities.py index 45dd874f5..c143bc941 100644 --- a/tools/cross_compile_android/android_utilities.py +++ b/tools/cross_compile_android/android_utilities.py @@ -17,8 +17,8 @@ from tqdm import tqdm # the tag number does not matter much since we update the sdk later DEFAULT_SDK_TAG = 6514223 -ANDROID_NDK_VERSION = "26b" -ANDROID_NDK_VERSION_NUMBER_SUFFIX = "10909125" +ANDROID_NDK_VERSION = "27c" +ANDROID_NDK_VERSION_NUMBER_SUFFIX = "12479018" def run_command(command: list[str], cwd: str | None = None, ignore_fail: bool = False, diff --git a/tools/cross_compile_android/main.py b/tools/cross_compile_android/main.py index 2884793ca..6636d080f 100644 --- a/tools/cross_compile_android/main.py +++ b/tools/cross_compile_android/main.py @@ -104,7 +104,7 @@ if __name__ == "__main__": parser.add_argument("-v", "--verbose", help="run in verbose mode", action="store_const", dest="loglevel", const=logging.INFO) - parser.add_argument("--api-level", type=str, default="34", + parser.add_argument("--api-level", type=str, default="35", help="Minimum Android API level to use") parser.add_argument("--ndk-path", type=str, help="Path to Android NDK (Preferred r26b)") # sdk path is needed to compile all the Qt Java Acitivity files into Qt6AndroidBindings.jar diff --git a/tools/cross_compile_android/templates/toolchain_default.tmpl.cmake b/tools/cross_compile_android/templates/toolchain_default.tmpl.cmake index c1cf6686f..0d630999d 100644 --- a/tools/cross_compile_android/templates/toolchain_default.tmpl.cmake +++ b/tools/cross_compile_android/templates/toolchain_default.tmpl.cmake @@ -28,11 +28,15 @@ set(QT_COMPILER_FLAGS "--target={{ plat_name }}-linux-android${_TARGET_NAME_ENDI -fomit-frame-pointer \ -march={{ gcc_march }} \ -msse4.2 \ - -mpopcnt \ -m{{ plat_bits }} \ -fPIC \ -I{{ target_python_path }}/include/python{{ python_version }} \ -Wno-unused-command-line-argument") + +if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") + set(QT_COMPILER_FLAGS "${QT_COMPILER_FLAGS} -mpopcnt") +endif() + set(QT_COMPILER_FLAGS_RELEASE "-O2 -pipe") # FIXME |