commit | 6beb6fadd58f391fed8384f15d5cfd4e9e4cec10 | [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 | 9ca82a7dccb967e006c157e6bb33e991727a0735 [diff] | |
parent | bafaf71bb7c1109caf7fe3a638f79b39e85fb1fb [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