aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-12-12 08:21:29 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-12-12 08:21:29 +0000
commitfc0851c4bcaa2eaeb6b56f31911e067cde519fcb (patch)
tree52a8e34a94027741fce3015dad327b19450f705c
parent6880412f9590f054902bac77c58ff801032f64ff (diff)
parenta2aa3366c79e073fc830636f180c22e4d8fb12e8 (diff)
downloadlibusb-fc0851c4bcaa2eaeb6b56f31911e067cde519fcb.tar.gz
Snap for 4498106 from a2aa3366c79e073fc830636f180c22e4d8fb12e8 to pi-release
Change-Id: Ia5880f2169abbf2bdb362163bac8b8aa4bc1feb2
-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"