aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Gao <jmgao@google.com>2017-12-08 13:01:53 -0800
committerJosh Gao <jmgao@google.com>2017-12-08 13:01:53 -0800
commitce171934d9c289b12b87c0539118f4c2bc0d745d (patch)
tree52a8e34a94027741fce3015dad327b19450f705c
parentd7d920d137ed252d6baa8023f1ca3d778d1e59e0 (diff)
downloadlibusb-ce171934d9c289b12b87c0539118f4c2bc0d745d.tar.gz
Compile libusb for windows.
Disable the usbdk backend, since all we care about is WinUSB. Bug: http://b/68993980 Test: mma Change-Id: If4ab45bbb6de1851c35a464d28a0e4fa6a36aa19
-rw-r--r--Android.bp5
-rw-r--r--windows/config.h2
2 files changed, 2 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index 62b575e..d753d50 100644
--- a/Android.bp
+++ b/Android.bp
@@ -76,7 +76,6 @@ cc_library {
"libusb/os/poll_windows.c",
"libusb/os/threads_windows.c",
"libusb/os/windows_nt_common.c",
- "libusb/os/windows_usbdk.c",
"libusb/os/windows_winusb.c",
],
@@ -85,9 +84,7 @@ cc_library {
],
cflags: ["-Werror"],
-
- // Not working yet.
- enabled: false,
+ enabled: true,
},
},
diff --git a/windows/config.h b/windows/config.h
index 4ef90a0..835160d 100644
--- a/windows/config.h
+++ b/windows/config.h
@@ -141,7 +141,7 @@
/* #undef USE_UDEV */
/* Use UsbDk Windows backend */
-#define USE_USBDK 1
+/* #undef USE_USBDK */
/* Version number of package */
#define VERSION "1.0.21-rc5"