commit 66680c506ab67802626112e96a5ccef3ef7565c1
author Dan Willemsen <dwillemsen@google.com> Thu Sep 03 20:29:56 2015 -0700
committer Dan Willemsen <dwillemsen@google.com> Fri Sep 04 14:05:19 2015 -0700
tree 1d3a54a02aa7dabd93f93a7e367763045ae35a0f
parent 30c13c4954a959c2e6c5ba126f26d88b2e56be61

Remove HOST_OS==windows check

With the HOST_CROSS_OS build system change, LOCAL_MULTILIB := first now
behaves the same way.

Change-Id: I03294403e5a106a53d4a0d48b176434221284901

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index c633cee..b228e86 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -118,9 +118,7 @@
 LOCAL_STATIC_LIBRARIES := libcrypto_static libbase
 
 LOCAL_C_INCLUDES_windows := development/host/windows/usb/api/
-ifneq ($(HOST_OS),windows)
-    LOCAL_MULTILIB := 64
-endif
+LOCAL_MULTILIB := first
 
 include $(BUILD_HOST_STATIC_LIBRARY)