Fix linux_scan_devices() in Android

Use linux_default_scan_devices() in Android platform.

When building for Android the USE_UDEV is false and __ANDROID__ is true
resulting in no implementation for linux_scan_devices(). This commit fix
it by using linux_default_scan_devices() for Android.

Closes #637

Signed-off-by: Vinicius Tinti <vinicius.tinti@almg.gov.br>
Signed-off-by: Nathan Hjelm <hjelmn@google.com>

diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
index 63fe592..6f77e34 100644 (file)
--- a/libusb/os/linux_usbfs.c
+++ b/libusb/os/linux_usbfs.c
@@ -560,7 +560,7 @@ static int linux_scan_devices(struct libusb_context *ctx)
 
 #if defined(USE_UDEV)
        ret = linux_udev_scan_devices(ctx);
-#elif !defined(__ANDROID__)
+#else
        ret = linux_default_scan_devices(ctx);
 #endif
 

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 0ab0323..dcba758 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11406
+#define LIBUSB_NANO 11407