updated android installer

Author: GvozdevLeonid

android/libhackrf/__init__.py

@@ -14,6 +14,8 @@ class LibhackrfRecipe(NDKRecipe):
     generated_libraries = ['libhackrf.so']
     site_packages_name = 'libhackrf'
     version = '2024.02.1'
+    library_release = '2024.02.1'
+    library_version = '0.9'
     depends = ['libusb']
     name = 'libhackrf'
 
@@ -58,6 +60,8 @@ def build_arch(self, arch, *extra_args):
                 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),
+                'LIBRARY_VERSION=' + self.library_version,
+                'LIBRARY_RELEASE=' + self.library_release,
                 'NDK='+self.ctx.ndk_dir,
                 'APP_ABI=' + arch.arch,
                 *extra_args,

android/libhackrf/jni/libhackrf.mk

@@ -33,7 +33,8 @@ LOCAL_EXPORT_C_INCLUDES := $(LIBUSB_ROOT_ABS)/host/libhackrf/src
 
 LOCAL_CFLAGS := \
 	-I$(LIBHACKRF_ROOT_ABS)/android/libusb \
-	-fvisibility=hidden \
+	-DLIBRARY_VERSION=\"$(LIBRARY_VERSION)\" \
+    -DLIBRARY_RELEASE=\"$(LIBRARY_RELEASE)\" \
 	-pthread
 
 LOCAL_LDLIBS := -L$(LOCAL_PATH) -lusb1.0 -llog

android/python_hackrf/__init__.py

@@ -6,7 +6,7 @@
 
 class PythonHackrfRecipe(CythonRecipe):
     url = 'https://github.com/GvozdevLeonid/python_hackrf/releases/download/v.{version}/python_hackrf-{version}.tar.gz'
-    depends = ['python3', 'setuptools', 'numpy', 'libusb', 'libhackrf']
+    depends = ['python3', 'setuptools', 'numpy', 'pyjnius', 'libhackrf']
     site_packages_name = 'python_hackrf'
     name = 'python_hackrf'
     version = '1.1.1'
@@ -15,24 +15,12 @@ def get_recipe_env(self, arch):
         env = super().get_recipe_env(arch)
 
         libhackrf_recipe = Recipe.get_recipe('libhackrf', arch)
-        libusb_recipe = Recipe.get_recipe('libusb', arch)
 
         libhackrf_h_dir = os.path.join(libhackrf_recipe.get_build_dir(arch), 'host', 'libhackrf', 'src')
-        libusb_h_dir = os.path.join(libusb_recipe.get_build_dir(arch), 'libusb')
 
         env['LDFLAGS'] += f' -L{self.ctx.get_libs_dir(arch.arch)}'
-        env['CFLAGS'] += f' -I{libusb_h_dir} -I{libhackrf_h_dir}'
+        env['CFLAGS'] += f' -I{libhackrf_h_dir}'
 
         return env
 
-    def prebuild_arch(self, arch):
-        super().prebuild_arch(arch)
-
-        if not os.path.exists(os.path.join(self.get_build_dir(arch.arch), 'python_hackrf', 'pylibhackrf', 'hackrf.c')):
-            libhackrf_recipe = Recipe.get_recipe('libhackrf', arch)
-
-            shutil.copy(os.path.join(libhackrf_recipe.get_build_dir(arch), 'host', 'libhackrf', 'src', 'hackrf.h'), os.path.join(self.get_build_dir(arch.arch), 'python_hackrf', 'pylibhackrf'))
-            shutil.copy(os.path.join(libhackrf_recipe.get_build_dir(arch), 'host', 'libhackrf', 'src', 'hackrf.c'), os.path.join(self.get_build_dir(arch.arch), 'python_hackrf', 'pylibhackrf'))
-
-
 recipe = PythonHackrfRecipe()