From 66680c506ab67802626112e96a5ccef3ef7565c1 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 3 Sep 2015 20:29:56 -0700 Subject: [PATCH] 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 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/adb/Android.mk b/adb/Android.mk index c633cee97..b228e8625 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -118,9 +118,7 @@ LOCAL_SANITIZE := $(adb_host_sanitize) 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)