commit b099c6f7a9295e49b225f16d943c00959677d312
author Dan Willemsen <dwillemsen@google.com> Wed Sep 09 18:31:10 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 09 18:31:10 2015 +0000
tree 110e397dd1ae4b6e4c06779d4445362aa57c2384
parent e626c23dacdd31cfe3c42ba65d34bb22374b295f
parent 0e406e36b22dfe0102dcf4f6f67f8afba20f59f8

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

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