updated recipes for android

Author: GvozdevLeonid

android/libhackrf/__init__.py

@@ -1,28 +1,29 @@
-from pythonforandroid.util import current_directory  # type: ignore
-from pythonforandroid.recipe import NDKRecipe  # type: ignore
-from pythonforandroid.recipe import Recipe  # type: ignore
-from pythonforandroid.logger import shprint  # type: ignore
-import shutil
-import sh  # type: ignore
 import os
+import shutil
+
+import sh
+from pythonforandroid.archs import Arch
+from pythonforandroid.logger import shprint
+from pythonforandroid.recipe import NDKRecipe, Recipe
+from pythonforandroid.util import current_directory
 
 
 class LibhackrfRecipe(NDKRecipe):
 
     url = 'https://github.com/greatscottgadgets/hackrf/releases/download/v{version}/hackrf-{version}.tar.xz'
-    patches = ['hackrf_android.patch']
-    generated_libraries = ['libhackrf.so']
+    patches = ('hackrf_android.patch', )
+    generated_libraries = ('libhackrf.so', )
     site_packages_name = 'libhackrf'
     version = '2024.02.1'
     library_release = '2024.02.1'
     library_version = '0.9'
-    depends = ['libusb']
+    depends = ('libusb', )
     name = 'libhackrf'
 
-    def should_build(self, arch):
-        return True
+    def should_build(self, arch: Arch) -> bool:
+        return not os.path.exists(os.path.join(self.ctx.get_libs_dir(arch.arch), 'libhackrf.so'))
 
-    def prebuild_arch(self, arch):
+    def prebuild_arch(self, arch: Arch) -> None:
         super().prebuild_arch(arch)
 
         if not os.path.exists(os.path.join(self.get_build_dir(arch.arch), 'android')):
@@ -38,19 +39,19 @@ def prebuild_arch(self, arch):
 
             shutil.copy(os.path.join(libusb_recipe.get_build_dir(arch), 'libusb', 'libusb.h'), os.path.join(self.get_build_dir(arch.arch), 'android', 'libusb'))
 
-    def get_recipe_env(self, arch):
+    def get_recipe_env(self, arch: Arch) -> dict:
         env = super().get_recipe_env(arch)
         env['LDFLAGS'] += f'-L{self.ctx.get_libs_dir(arch.arch)}'
 
         return env
 
-    def get_jni_dir(self, arch):
+    def get_jni_dir(self, arch: Arch) -> str:
         return os.path.join(self.get_build_dir(arch.arch), 'android', 'jni')
 
-    def get_lib_dir(self, arch):
+    def get_lib_dir(self, arch: Arch) -> str:
         return os.path.join(self.get_build_dir(arch.arch), 'android', 'obj', 'local', arch.arch)
 
-    def build_arch(self, arch, *extra_args):
+    def build_arch(self, arch: Arch, *extra_args) -> None:
         env = self.get_recipe_env(arch)
 
         shutil.copyfile(os.path.join(self.ctx.get_libs_dir(arch.arch), 'libusb1.0.so'), os.path.join(self.get_build_dir(arch.arch), 'android', 'jni', 'libusb1.0.so'))
@@ -62,10 +63,10 @@ def build_arch(self, arch, *extra_args):
                 'APP_PLATFORM=android-' + str(self.ctx.ndk_api),
                 'LIBRARY_VERSION=' + self.library_version,
                 'LIBRARY_RELEASE=' + self.library_release,
-                'NDK='+self.ctx.ndk_dir,
+                'NDK=' + self.ctx.ndk_dir,
                 'APP_ABI=' + arch.arch,
                 *extra_args,
-                _env=env
+                _env=env,
             )
 
         shutil.copyfile(os.path.join(self.get_build_dir(arch.arch), 'android', 'libs', arch.arch, 'libhackrf.so'), os.path.join(self.ctx.get_libs_dir(arch.arch), 'libhackrf.so'))

android/libusb/__init__.py

@@ -1,39 +1,41 @@
-from pythonforandroid.util import current_directory  # type: ignore
-from pythonforandroid.recipe import NDKRecipe  # type: ignore
-from pythonforandroid.logger import shprint  # type: ignore
-import shutil
-import sh  # type: ignore
 import os
+import shutil
+
+import sh
+from pythonforandroid.archs import Arch
+from pythonforandroid.logger import shprint
+from pythonforandroid.recipe import NDKRecipe
+from pythonforandroid.util import current_directory
 
 
 class LibusbRecipe(NDKRecipe):
 
     url = 'https://github.com/libusb/libusb/archive/refs/tags/v{version}.tar.gz'
-    generated_libraries = ['libusb-1.0.so']
+    generated_libraries = ('libusb-1.0.so', )
     site_packages_name = 'libusb'
     version = '1.0.26'
     name = 'libusb'
 
-    def should_build(self, arch):
-        return True
+    def should_build(self, arch: Arch) -> bool:
+        return not os.path.exists(os.path.join(self.ctx.get_libs_dir(arch.arch), 'libusb1.0.so'))
 
-    def get_jni_dir(self, arch):
+    def get_jni_dir(self, arch: Arch) -> str:
         return os.path.join(self.get_build_dir(arch.arch), 'android', 'jni')
 
-    def get_lib_dir(self, arch):
+    def get_lib_dir(self, arch: Arch) -> str:
         return os.path.join(self.get_build_dir(arch.arch), 'android', 'obj', 'local', arch.arch)
 
-    def build_arch(self, arch, *extra_args):
+    def build_arch(self, arch: Arch, *extra_args) -> None:
         env = self.get_recipe_env(arch)
         with current_directory(self.get_build_dir(arch.arch)):
             shprint(
                 sh.Command(os.path.join(self.ctx.ndk_dir, 'ndk-build')),
                 'NDK_PROJECT_PATH=' + self.get_build_dir(arch.arch) + '/android',
                 'APP_PLATFORM=android-' + str(self.ctx.ndk_api),
-                'NDK='+self.ctx.ndk_dir,
+                'NDK=' + self.ctx.ndk_dir,
                 'APP_ABI=' + arch.arch,
                 *extra_args,
-                _env=env
+                _env=env,
             )
 
         shutil.copyfile(os.path.join(self.get_build_dir(arch.arch), 'android', 'libs', arch.arch, 'libusb1.0.so'), os.path.join(self.ctx.get_libs_dir(arch.arch), 'libusb1.0.so'))

android/python_hackrf/__init__.py

@@ -1,16 +1,20 @@
-from pythonforandroid.recipe import CythonRecipe  # type: ignore
-from pythonforandroid.recipe import Recipe  # type: ignore
 import os
 
+from pythonforandroid.archs import Arch
+from pythonforandroid.recipe import (
+    CythonRecipe,
+    Recipe,
+)
+
 
 class PythonHackrfRecipe(CythonRecipe):
     url = 'https://github.com/GvozdevLeonid/python_hackrf/releases/download/v.{version}/python_hackrf-{version}.tar.gz'
-    depends = ['python3', 'setuptools', 'numpy', 'pyjnius', 'libhackrf']
+    depends = ('python3', 'setuptools', 'numpy', 'pyjnius', 'libhackrf')
     site_packages_name = 'python_hackrf'
     name = 'python_hackrf'
-    version = '1.2.1'
+    version = '1.2.2'
 
-    def get_recipe_env(self, arch):
+    def get_recipe_env(self, arch: Arch) -> dict:
         env = super().get_recipe_env(arch)
 
         libhackrf_recipe = Recipe.get_recipe('libhackrf', arch)