diff options
Diffstat (limited to 'sources/pyside-tools/deploy_lib/android/android_config.py')
| -rw-r--r-- | sources/pyside-tools/deploy_lib/android/android_config.py | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/sources/pyside-tools/deploy_lib/android/android_config.py b/sources/pyside-tools/deploy_lib/android/android_config.py index 1ea99411f..8054ce373 100644 --- a/sources/pyside-tools/deploy_lib/android/android_config.py +++ b/sources/pyside-tools/deploy_lib/android/android_config.py @@ -121,20 +121,21 @@ class AndroidConfig(Config): self._dependency_files = [] self._find_and_set_dependency_files() - self._qt_plugins = [] - if self.get_value("android", "plugins"): - self._qt_plugins = self.get_value("android", "plugins").split(",") - + dependent_plugins = [] self._local_libs = [] if self.get_value("buildozer", "local_libs"): - self.local_libs = self.get_value("buildozer", "local_libs").split(",") + self._local_libs = self.get_value("buildozer", "local_libs").split(",") + else: + # the local_libs can also store dependent plugins + local_libs, dependent_plugins = self._find_local_libs() + self.local_libs = list(set(local_libs)) - dependent_plugins = [] - # the local_libs can also store dependent plugins - local_libs, dependent_plugins = self._find_local_libs() - self._find_plugin_dependencies(dependent_plugins) - self.qt_plugins += dependent_plugins - self.local_libs += local_libs + self._qt_plugins = [] + if self.get_value("android", "plugins"): + self._qt_plugins = self.get_value("android", "plugins").split(",") + elif dependent_plugins: + self._find_plugin_dependencies(dependent_plugins) + self.qt_plugins = list(set(dependent_plugins)) recipe_dir_temp = self.get_value("buildozer", "recipe_dir") if recipe_dir_temp: @@ -382,11 +383,6 @@ class AndroidConfig(Config): # eg: lib<lib_name>_x86_64.so file_name = Path(file).stem - if file_name.startswith("libplugins_platforms_qtforandroid"): - # the platform library is a requisite and is already added from the - # configuration file - continue - # we only need lib_name, because lib and arch gets re-added by # python-for-android match = lib_pattern.search(file_name) |