diff options
| author | Josh Gao <jmgao@google.com> | 2017-12-11 19:53:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-11 19:53:59 +0000 |
| commit | a2aa3366c79e073fc830636f180c22e4d8fb12e8 (patch) | |
| tree | 52a8e34a94027741fce3015dad327b19450f705c | |
| parent | 942622099835243df8c6754babb1c11d305d864d (diff) | |
| parent | 250433c7ae71fb518a91411ed37ce7a8233d097c (diff) | |
| download | libusb-a2aa3366c79e073fc830636f180c22e4d8fb12e8.tar.gz | |
Merge "Compile libusb for windows." am: a903d2e97a am: c464d966ff
am: 250433c7ae
Change-Id: I8b77d27d5409aa4f699ee81777778d6ec574ed85
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | windows/config.h | 2 |
2 files changed, 2 insertions, 5 deletions
@@ -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" |