diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2023-03-02 14:29:33 +0100 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2023-03-10 14:35:44 +0100 |
| commit | c5425b185411cdcc6ee24977dc29795320038676 (patch) | |
| tree | 311eedf19bb4195475d984d7631f835958c1bf9c | |
| parent | 4e98b54c9df23bb23f1867be41382fdc9b11cff1 (diff) | |
Android Deployment: Add Sdk path to toolchain
- ANDROID_SDK_ROOT has to be set for compiling the essential Android
java classes into Qt6AndroidBindings.jar. This .jar file will be
shipped with the Android wheels.
Task-number: PYSIDE-1612
Change-Id: I496f7578a6e104d947e6d643993a645c887151b4
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | tools/cross_compile_android/main.py | 5 | ||||
| -rw-r--r-- | tools/cross_compile_android/templates/toolchain_default.tmpl.cmake | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tools/cross_compile_android/main.py b/tools/cross_compile_android/main.py index a3cad74ec..e2fe7352e 100644 --- a/tools/cross_compile_android/main.py +++ b/tools/cross_compile_android/main.py @@ -74,6 +74,9 @@ if __name__ == "__main__": parser.add_argument("--api-level", type=str, default="31", help="Android API level to use") parser.add_argument("--ndk-path", type=str, required=True, help="Path to Android NDK (Preferred 25b)") + # sdk path is needed to compile all the Qt Java Acitivity files into Qt6AndroidBindings.jar + parser.add_argument("--sdk-path", type=str, required=True, + help="Path to Android SDK") parser.add_argument("--qt-install-path", type=str, required=not occp_exists(), help="Qt installation path eg: /home/Qt/6.5.0") @@ -101,6 +104,7 @@ if __name__ == "__main__": pyside_setup_dir = Path(__file__).parents[2].resolve() qt_install_path = args.qt_install_path ndk_path = args.ndk_path + sdk_path = args.sdk_path only_py_cross_compile = args.only_cross_compile_python python_path = args.android_python_install_path # the same android platforms are named differently in CMake, Cpython and Qt. @@ -207,6 +211,7 @@ if __name__ == "__main__": template = environment.get_template("toolchain_default.tmpl.cmake") content = template.render( ndk_path=ndk_path, + sdk_path=sdk_path, api_level=platform_data.api_level, qt_install_path=qt_install_path, plat_name=platform_data.plat_name, diff --git a/tools/cross_compile_android/templates/toolchain_default.tmpl.cmake b/tools/cross_compile_android/templates/toolchain_default.tmpl.cmake index cc73cf485..47040dac2 100644 --- a/tools/cross_compile_android/templates/toolchain_default.tmpl.cmake +++ b/tools/cross_compile_android/templates/toolchain_default.tmpl.cmake @@ -14,6 +14,7 @@ set(CMAKE_ANDROID_STL_TYPE c++_shared) if(NOT DEFINED ANDROID_PLATFORM AND NOT DEFINED ANDROID_NATIVE_API_LEVEL) set(ANDROID_PLATFORM "android-{{ api_level }}" CACHE STRING "") endif() +set(ANDROID_SDK_ROOT {{ sdk_path }}) set(QT_COMPILER_FLAGS "--target={{ plat_name }}-linux-android{{ api_level }} \ -fomit-frame-pointer \ |