From 211d79185120519ca9c436855d3b7406359e793b Mon Sep 17 00:00:00 2001 From: Vinicius Tinti Date: Mon, 7 Oct 2019 08:24:17 -0300 Subject: 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 Signed-off-by: Nathan Hjelm --- libusb/os/linux_usbfs.c | 2 +- libusb/version_nano.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c index 63fe592..6f77e34 100644 --- 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 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11406 +#define LIBUSB_NANO 11407 -- cgit v1.2.1