commit f48503b4a0b5075fa6919260d873887d14916f2d
author Ying Wang <wangying@google.com> Mon Feb 29 19:27:06 2016 -0800
committer Josh Gao <jmgao@google.com> Thu Mar 03 15:46:50 2016 -0800
tree d480e8dd887921a214db0092bc088a5f9eb79df4
parent a63b17f76c54d937c779848ae3f4212539f8873f

Also archive adb.exe/fastboot.exe when building win_sdk.

On linux we archive both Linux and Windows binaries.

Bug: 27315911
Change-Id: I17d25cd1ea611a9c917f1e78b47f21a8959eea20
(cherry picked from commit 71edfc8b9ab78f00206828993526aedd115c46b1)

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 2dba41d..f1d3bee 100644
--- a/adb/Android.mk
+++ b/adb/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