diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-05-31 14:12:48 +0200 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-06-14 10:54:36 +0200 |
| commit | 7093016a138b79c335272d40ee7487bf19282541 (patch) | |
| tree | 6d25656f654c5c0ec700f668e0c1315492757569 /sources/pyside-tools/deploy_lib/android/android_config.py | |
| parent | 2d31f7becfa91d34d7199eba0ac0af6e5485af71 (diff) | |
Android Deployment: Enable pyside6-android-deploy in macOS
- enable the tool for macOS
- add dependency .xml to the Android wheels
Pick-to: 6.7
Task-number: PYSIDE-2766
Change-Id: I77495466b8a9cc3565c640beac202d533ee1d2a6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside-tools/deploy_lib/android/android_config.py')
| -rw-r--r-- | sources/pyside-tools/deploy_lib/android/android_config.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sources/pyside-tools/deploy_lib/android/android_config.py b/sources/pyside-tools/deploy_lib/android/android_config.py index ad818c2ff..151b606cb 100644 --- a/sources/pyside-tools/deploy_lib/android/android_config.py +++ b/sources/pyside-tools/deploy_lib/android/android_config.py @@ -1,6 +1,7 @@ # Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only import re +import sys import tempfile import logging import zipfile @@ -15,6 +16,7 @@ from . import (extract_and_copy_jar, get_wheel_android_arch, find_lib_dependenci from .. import (Config, find_pyside_modules, get_all_pyside_modules, MAJOR_VERSION) ANDROID_NDK_VERSION = "26b" +ANDROID_NDK_VERSION_NUMBER_SUFFIX = "10909125" ANDROID_DEPLOY_CACHE = Path.home() / ".pyside6_android_deploy" @@ -58,6 +60,11 @@ class AndroidConfig(Config): else: ndk_path_temp = (ANDROID_DEPLOY_CACHE / "android-ndk" / f"android-ndk-r{ANDROID_NDK_VERSION}") + if sys.platform == "darwin": + ndk_path_temp = ( + ANDROID_DEPLOY_CACHE / "android-ndk" + / f"AndroidNDK{ANDROID_NDK_VERSION_NUMBER_SUFFIX}.app/Contents/NDK" + ) if ndk_path_temp.exists(): self.ndk_path = ndk_path_temp |