aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside-tools/android_deploy.py
diff options
context:
space:
mode:
authorShyamnath Premnadh <Shyamnath.Premnadh@qt.io>2023-10-24 16:10:56 +0200
committerShyamnath Premnadh <Shyamnath.Premnadh@qt.io>2024-02-29 10:32:54 +0100
commitec6a0f8baef5c6d4e80e650e11a498756e6055e6 (patch)
treed4f0c4ba59ae239a8841ac68683da58e5e0dd440 /sources/pyside-tools/android_deploy.py
parent489899819f4b417f8bc8923b1eb03728bed4bb5e (diff)
Deployment: Refactoring
- Functions in buildozer.py for finding the local_libs, plugin and Qt module dependencies of the application are related to the overall config of the application and not buildozer. Hence, these functions are moved to android_config.py. - `ALL_PYSIDE_MODULES` moved to a function under deploy_lib/__init__.py and `platform_map` moved to deploy_lib/android/__init__.py. - Enable the user to pass both arm64-v8a and aarch64 as the architecture type. Same for all the other architecures that are synonymous. - `verify_and_set_recipe_dir()` is now called explicitly from android_deploy.py due to `cleanup()` deleting the recipe directories during config initialization. - New property `dependency_files` for AndroidConfig class. - Fix --dry-run for Android Deployment. - Adapt tests. Pick-to: 6.6 Task-number: PYSIDE-1612 Change-Id: Icdf14001ae2b07dc8614af3f458f9cad11eafdac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside-tools/android_deploy.py')
-rw-r--r--sources/pyside-tools/android_deploy.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/sources/pyside-tools/android_deploy.py b/sources/pyside-tools/android_deploy.py
index 8ef59781f..83350bc5f 100644
--- a/sources/pyside-tools/android_deploy.py
+++ b/sources/pyside-tools/android_deploy.py
@@ -130,6 +130,7 @@ def main(name: str = None, pyside_wheel: Path = None, shiboken_wheel: Path = Non
# this cannot be done when config file is initialized because cleanup() removes it
# so this can only be done after the cleanup()
config.find_and_set_jars_dir()
+ config.verify_and_set_recipe_dir()
# TODO: include qml files from pysidedeploy.spec rather than from extensions
# buildozer currently includes all the files with .qml extension