diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-09 19:49:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-09 19:49:23 +0000 |
| commit | ef213b6d5b5c5e8d9403c7d41724c815d2831055 (patch) | |
| tree | 711989a50b5b6ccbe6b8ff09ceb69f2697a3ab4b /fastboot | |
| parent | a1e27d342e05fc504ce7140463d17336c53a1af8 (diff) | |
| parent | b0449da977d85f17d92b83912271910a364c9f2b (diff) | |
| download | system_core-ef213b6d5b5c5e8d9403c7d41724c815d2831055.tar.gz system_core-ef213b6d5b5c5e8d9403c7d41724c815d2831055.tar.bz2 system_core-ef213b6d5b5c5e8d9403c7d41724c815d2831055.zip | |
Merge "adb/fastboot: switch over to shared AdbWinApi."
Diffstat (limited to 'fastboot')
| -rw-r--r-- | fastboot/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk index 10ef35681..dfcf090b7 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -50,8 +50,8 @@ LOCAL_LDLIBS_darwin := -lpthread -framework CoreFoundation -framework IOKit -fra LOCAL_CFLAGS_darwin := -Wno-unused-parameter LOCAL_SRC_FILES_windows := usb_windows.cpp -LOCAL_STATIC_LIBRARIES_windows := AdbWinApi -LOCAL_REQUIRED_MODULES_windows := AdbWinApi AdbWinUsbApi +LOCAL_SHARED_LIBRARIES_windows := AdbWinApi +LOCAL_REQUIRED_MODULES_windows := AdbWinUsbApi LOCAL_LDLIBS_windows := -lws2_32 LOCAL_C_INCLUDES_windows := development/host/windows/usb/api |