| commit | 05ca853f0c9f92c4d68b254e34c5a3c5a2ca8202 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Tue Dec 22 22:20:42 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 22 22:20:42 2015 +0000 |
| tree | 7855602a63d58798df6366dd5b5ac9c97891c7ba | |
| parent | ff7b64f6e358a24a7216694b673fc7e7903fbf06 [diff] | |
| parent | 1a39d96be59bdfa4dc3741c156659ba3ddd6227e [diff] |
Merge "Limit adb_test to first multilib" am: 3fb7d97689 am: 03e6f710bc * commit '03e6f710bc5263cbaf53149dac1d7f775a9ab051': 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