| commit | 87a72a8a3813842b9de7e91bb4077ebfcf2d2ad4 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Sep 11 23:13:40 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Sep 11 23:13:40 2015 +0000 |
| tree | 669d9da7f4a41bd112a783591677b2fa5820a76a | |
| parent | 87e38699836dc2257c604c9b5e6fea2615d683e6 [diff] | |
| parent | 1be2aa00e45014dd09f8fe64f33db017b588f33e [diff] |
Merge "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)