diff options
author | Vinicius Tinti <vinicius.tinti@almg.gov.br> | 2019-10-07 08:24:17 -0300 |
---|---|---|
committer | Nathan Hjelm <hjelmn@google.com> | 2019-10-30 19:04:54 -0700 |
commit | 211d79185120519ca9c436855d3b7406359e793b (patch) | |
tree | defde150600bc6c9e591bbe6be1d084cd0fdf16f | |
parent | e924b8fccf6ed74ac911bb5a8b4c3cb9679334b0 (diff) | |
download | libusb-211d79185120519ca9c436855d3b7406359e793b.tar.gz |
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>
-rw-r--r-- | libusb/os/linux_usbfs.c | 2 | ||||
-rw-r--r-- | 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 |