diff options
| author | Josh Gao <jmgao@google.com> | 2017-12-11 19:38:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-11 19:38:10 +0000 |
| commit | c464d966ffd06b63b007f3e3800e388d32b90369 (patch) | |
| tree | 52a8e34a94027741fce3015dad327b19450f705c | |
| parent | d7d920d137ed252d6baa8023f1ca3d778d1e59e0 (diff) | |
| parent | a903d2e97a4790d04366cb51c2e92f5a6f5fbb88 (diff) | |
| download | libusb-c464d966ffd06b63b007f3e3800e388d32b90369.tar.gz | |
Merge "Compile libusb for windows."
am: a903d2e97a
Change-Id: Id24e37fa40bce74f8f797aae92bacb512e06f842
| -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" |