diff --git a/build/tools/make_windows_sdk.sh b/build/tools/make_windows_sdk.sh index 2a6433ad1..11ab3976d 100755 --- a/build/tools/make_windows_sdk.sh +++ b/build/tools/make_windows_sdk.sh @@ -195,9 +195,9 @@ function package() { # Now move the final zip from the temp dest to the final dist dir mv -v "$TEMP_DIR/$DEST_NAME_ZIP" "$DIST_DIR/$DEST_NAME_ZIP" - # We want fastboot and adb next to the new SDK - for i in fastboot.exe adb.exe AdbWinApi.dll; do - mv -vf out/host/windows-x86/bin/$i "$DIST_DIR"/$i + # We want fastboot and adb (and its DLLs) next to the new SDK + for i in fastboot.exe adb.exe AdbWinApi.dll AdbWinUsbApi.dll; do + cp -vf out/host/windows-x86/bin/$i "$DIST_DIR"/$i done echo "Done" diff --git a/host/windows/prebuilt/usb/Android.mk b/host/windows/prebuilt/usb/Android.mk index 180610109..9cf4e61f3 100644 --- a/host/windows/prebuilt/usb/Android.mk +++ b/host/windows/prebuilt/usb/Android.mk @@ -6,7 +6,8 @@ LOCAL_PREBUILT_LIBS := \ AdbWinApi.a LOCAL_PREBUILT_EXECUTABLES := \ - AdbWinApi.dll + AdbWinApi.dll \ + AdbWinUsbApi.dll .PHONY : kill-adb