| commit | 5a2de8b711188540b98aae9d72a46c12a6e679c5 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Sep 11 23:23:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 11 23:23:50 2015 +0000 |
| tree | d7efbefb068d2f04093d6297b396797563382e9a | |
| parent | f53484bee8b4bc7419cd10531624e79d4a448818 [diff] | |
| parent | 87a72a8a3813842b9de7e91bb4077ebfcf2d2ad4 [diff] |
am 0ad13cf2: Merge "fix adb_test Windows build" * commit '0ad13cf2982d428a4db742877720e5f4be738fa4': fix adb_test Windows build
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)