aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-12-11 19:24:41 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-12-11 19:24:41 +0000
commita903d2e97a4790d04366cb51c2e92f5a6f5fbb88 (patch)
tree52a8e34a94027741fce3015dad327b19450f705c
parentd7d920d137ed252d6baa8023f1ca3d778d1e59e0 (diff)
parentce171934d9c289b12b87c0539118f4c2bc0d745d (diff)
downloadlibusb-a903d2e97a4790d04366cb51c2e92f5a6f5fbb88.tar.gz
Merge "Compile libusb for windows."
-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"