diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-03-12 16:46:05 +0100 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-03-13 13:58:45 +0100 |
| commit | 722cba9af5143222e726a113718d4a32c97d6cae (patch) | |
| tree | 991e7c2d153711d7b1153f8d7dddbdbd002d3aa1 /tools/cross_compile_android/main.py | |
| parent | 0632caba93a17eb429fa2c7153f7fa4005542ce6 (diff) | |
Android Wheels: Update Python version to 3.11
- python-for-android target python is now upgrade to 3.11 -
https://github.com/kivy/python-for-android/pull/2850. This constrains
us to update to 3.11 to resolve linker issues for shiboken and PySide
binaries.
- The also helps for CI wheel creation since the Python version in our
CI system is 3.11.
- As a drive-by remove designer plugins from Android wheels.
Task-number: PYSIDE-1612
Change-Id: I8c75d4d4567b6830e26a2d9a24db90592f6dc03d
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Diffstat (limited to 'tools/cross_compile_android/main.py')
| -rw-r--r-- | tools/cross_compile_android/main.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/cross_compile_android/main.py b/tools/cross_compile_android/main.py index 9c4616e97..1aeaed2fe 100644 --- a/tools/cross_compile_android/main.py +++ b/tools/cross_compile_android/main.py @@ -18,7 +18,7 @@ from android_utilities import (run_command, download_android_commandlinetools, download_android_ndk, install_android_packages) # Note: Does not work with PyEnv. Your Host Python should contain openssl. -PYTHON_VERSION = "3.10" +PYTHON_VERSION = "3.11" SKIP_UPDATE_HELP = ("skip the updation of SDK packages build-tools, platform-tools to" " latest version") @@ -86,7 +86,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="31", help="Android API level to use") + parser.add_argument("--api-level", type=str, default="33", help="Android API level to use") parser.add_argument("--ndk-path", type=str, help="Path to Android NDK (Preferred r25c)") # sdk path is needed to compile all the Qt Java Acitivity files into Qt6AndroidBindings.jar parser.add_argument("--sdk-path", type=str, help="Path to Android SDK") @@ -221,6 +221,7 @@ if __name__ == "__main__": ndk_path=ndk_path, api_level=platform_data.api_level, android_py_install_path_prefix=pyside6_deploy_cache, + host_python_path=sys.executable ) logging.info(f"Writing Python cross compile script into {python_ccompile_script}") @@ -295,5 +296,5 @@ if __name__ == "__main__": f"--python-target-path={python_path}", (f"--qt-target-path={qt_install_path}/" f"android_{platform_data.qt_plat_name}"), - "--no-qt-tools", "--unity"] + "--no-qt-tools", "--unity", "--module-subset=Core,Gui,Widgets"] run_command(qfp_ccompile_cmd, cwd=pyside_setup_dir, dry_run=dry_run, show_stdout=True) |