Merge "Emulator: fix adbd qemu pipe partial write"
diff --git a/Android.mk b/Android.mk
index 2dba41d..f1d3bee 100644
--- a/Android.mk
+++ b/Android.mk
@@ -288,7 +288,11 @@
include $(BUILD_HOST_EXECUTABLE)
-$(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE))
+$(call dist-for-goals,dist_files sdk win_sdk,$(LOCAL_BUILT_MODULE))
+ifdef HOST_CROSS_OS
+# Archive adb.exe for win_sdk build.
+$(call dist-for-goals,win_sdk,$(ALL_MODULES.host_cross_adb.BUILT))
+endif
# adbd device daemon
diff --git a/file_sync_client.cpp b/file_sync_client.cpp
index 3a81ce6..cdbff11 100644
--- a/file_sync_client.cpp
+++ b/file_sync_client.cpp
@@ -188,6 +188,7 @@
WriteOrDie(lpath, rpath, &buf[0], (p - &buf[0]));
expect_done_ = true;
total_bytes_ += data_length;
+ ReportProgress(rpath, data_length, data_length);
return true;
}