commit 0e406e36b22dfe0102dcf4f6f67f8afba20f59f8
author Dan Willemsen <dwillemsen@google.com> Wed Sep 09 18:19:15 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 09 18:19:15 2015 +0000
tree d4e298cc7ea733cb0bec35381b660383c45468fc
parent 24b7c50fa6950bc000a029803c634285b382903a
parent 7962968f4e5b6918db5b789d5cf01ad40cc66628

am aaf4fcf4: Merge "Remove HOST_OS==windows check"

* commit 'aaf4fcf482d427459c70e10a22fef5ea9c7bca1a':
  Remove HOST_OS==windows check

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 9600133..b34a49f 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)