commit 40d9f457c90409e9ed801f441f88085f7a78144c
author Elliott Hughes <enh@google.com> Fri Sep 11 23:30:35 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 11 23:30:35 2015 +0000
tree b4247322a030fa2b405f2dcdad613291951bf9e5
parent 8c8bb389d835f3a755f758e53a1986735b06a74b
parent 5a2de8b711188540b98aae9d72a46c12a6e679c5

am 61eee363: am 0ad13cf2: Merge "fix adb_test Windows build"

* commit '61eee3636f96a0b32be3304796e6af4421d03a4e':
  fix adb_test Windows build

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index a64f48c..67c3eb7 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -145,6 +145,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := adb_test
+LOCAL_MODULE_HOST_OS := darwin linux windows
 LOCAL_CFLAGS := -DADB_HOST=1 $(LIBADB_CFLAGS)
 LOCAL_CFLAGS_windows := $(LIBADB_windows_CFLAGS)
 LOCAL_CFLAGS_linux := $(LIBADB_linux_CFLAGS)