| commit | f56cdacae8d5dab1b74f79bf7b7342a4e831f3cb | [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 | aa1c7327abf786302659e9ea76c2db58a475a5b3 | |
| parent | 50740f56162807f9e88d36249e7d466d8ce5a282 [diff] | |
| parent | 639cea4ae15afaaee1be9d484fa13aae08cd3a53 [diff] |
Merge "fix adb_test Windows build"
diff --git a/Android.mk b/Android.mk index a64f48c..67c3eb7 100644 --- a/Android.mk +++ b/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)