Android Wheels: Update Python version to 3.11

- python-for-android target python is now upgrade to 3.11 -
  kivy/python-for-android#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 <[email protected]>

Author: ShyamQt

build_scripts/platforms/linux.py

@@ -95,7 +95,7 @@ def prepare_standalone_package_linux(pyside_build, _vars, cross_build=False, is_
                 _filter=["*.so"],
                 recursive=True,
                 _vars=_vars)
-        if not is_pypy:
+        if not is_pypy and not is_android:
             copydir("{install_dir}/plugins/designer",
                     plugins_target / "designer",
                     _filter=["*.so"],

sources/shiboken6/cmake/ShibokenHelpers.cmake

@@ -206,7 +206,7 @@ macro(get_python_extension_suffix)
         # it is unable to set Python_CONFIG i.e. find `python3-config` script
         # This workaround sets the Python_SOABI manually for this platform.
         if(CMAKE_SYSTEM_NAME STREQUAL "Android" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a")
-            set(Python_SOABI "cpython-310}")
+            set(Python_SOABI "cpython-311}")
         endif()
         if(NOT Python_SOABI)
             message(FATAL_ERROR "Python_SOABI variable is empty.")

tools/cross_compile_android/main.py

@@ -18,7 +18,7 @@
                                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 @@ def update(self, op_code, cur_count, max_count=None, message=""):
 
     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 @@ def update(self, op_code, cur_count, max_count=None, message=""):
                     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 @@ def update(self, op_code, cur_count, max_count=None, message=""):
                             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)

tools/cross_compile_android/templates/cross_compile.tmpl.sh

@@ -20,7 +20,8 @@ export RANLIB=$TOOLCHAIN/llvm-ranlib
 export LD=$TOOLCHAIN/ld
 export READELF=$TOOLCHAIN/llvm-readelf
 export CFLAGS='-fPIC -DANDROID'
-./configure --host=$HOST_ARCH --target=$HOST_ARCH --build=x86_64-pc-linux-gnu --enable-shared \
+./configure --host=$HOST_ARCH --target=$HOST_ARCH --build=x86_64-pc-linux-gnu \
+--with-build-python={{ host_python_path }}  --enable-shared \
 --enable-ipv6 ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no --without-ensurepip \
 ac_cv_little_endian_double=yes
 make BLDSHARED="$CC -shared" CROSS-COMPILE=$TOOL_PREFIX- CROSS_COMPILE_TARGET=yes