commit d359a8fa3f9f83f5de7f033b9c3cc02995bea643
author Dan Willemsen <dwillemsen@google.com> Wed Sep 09 18:37:21 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 09 18:37:21 2015 +0000
tree ec7ca17a27f2bada022a6d4f69cd1daf5b7b7ecb
parent 15cd49b3e1a93750ad0509a9aa5869ec7d9a1dfe
parent b099c6f7a9295e49b225f16d943c00959677d312

am 2f6d1e54: am a376c046: am aaf4fcf4: Merge "Remove HOST_OS==windows check"

* commit '2f6d1e5486042887e4ca864f0921409fd219e192':
  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)