From 0fe02af0e8ce976eaca9225d19b501f627723bd9 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 24 Apr 2020 15:19:04 -0700 Subject: build-system/android: remove libusb at QTest We no longer use libusb to access USB devices on Android, therefore there's no point including libusb in our build. Also, we have never even attempted to run the tests on Android, so let's not even pretend to support building them. Signed-off-by: Dirk Hohndel --- core/android.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'core') diff --git a/core/android.cpp b/core/android.cpp index d1a1570fb..34d4ac46e 100644 --- a/core/android.cpp +++ b/core/android.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -38,13 +37,6 @@ double system_divelist_default_font_size = -1; int get_usb_fd(uint16_t idVendor, uint16_t idProduct); void subsurface_OS_pref_setup(void) { - // Abusing this function to get a decent place where we can wire in - // our open callback into libusb -#ifdef libusb_android_open_callback_func - libusb_set_android_open_callback(get_usb_fd); -#elif __ANDROID__ -#error we need libusb_android_open_callback -#endif } bool subsurface_ignore_font(const char *font) -- cgit v1.2.3-70-g09d2