| commit | 3fb7d9768974443b7832255b2419c3b0c162a8cb | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Tue Dec 22 22:05:31 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Dec 22 22:05:31 2015 +0000 |
| tree | 6f3b315e05fdf470ff88321dde6c8f40db1060c9 | |
| parent | c947a13772ac4b709c656921e0a52ee32e3c5fdf [diff] | |
| parent | 1e20e0aa1d5bef60377376195abd244ceae81c7c [diff] |
Merge "Limit adb_test to first multilib"
diff --git a/adb/Android.mk b/adb/Android.mk index cb6da62..9c8ab6d 100644 --- a/adb/Android.mk +++ b/adb/Android.mk
@@ -207,6 +207,8 @@ LOCAL_LDLIBS_windows := -lws2_32 -luserenv LOCAL_STATIC_LIBRARIES_windows := AdbWinApi +LOCAL_MULTILIB := first + include $(BUILD_HOST_NATIVE_TEST) # adb device tracker (used by ddms) test tool