From 3bc8fd9e50702a2d48461ac49251b590d05deda0 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Tue, 20 May 2014 15:46:57 -0700
Subject: [PATCH] Host multilib build.

Bug: 13751317
Change-Id: I05ad98c1f3f55e3288fbcc169311a7685b872fd9
---
 host/windows/prebuilt/usb/Android.mk | 42 +++++++++++++++-------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/host/windows/prebuilt/usb/Android.mk b/host/windows/prebuilt/usb/Android.mk
index 9cf4e61f3..e8af1678b 100644
--- a/host/windows/prebuilt/usb/Android.mk
+++ b/host/windows/prebuilt/usb/Android.mk
@@ -1,24 +1,28 @@
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE := AdbWinApi
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_SRC_FILES_x86 := AdbWinApi.a
+LOCAL_MODULE_SUFFIX := .a
+LOCAL_MULTILIB := 32
+include $(BUILD_PREBUILT)
 
-LOCAL_PREBUILT_LIBS := \
-	AdbWinApi.a
+include $(CLEAR_VARS)
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE := AdbWinApi
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_SRC_FILES_x86 := AdbWinApi.dll
+LOCAL_MODULE_SUFFIX := .dll
+LOCAL_MULTILIB := 32
+include $(BUILD_PREBUILT)
 
-LOCAL_PREBUILT_EXECUTABLES := \
-	AdbWinApi.dll  \
-	AdbWinUsbApi.dll
-	
-.PHONY : kill-adb
-	
-$(LOCAL_PATH)/AdbWinApi.dll : kill-adb
-
-kill-adb:
-	@echo "Killing adb server so we can replace AdbWinApi.dll"
-	@adb kill-server || echo "adb appears to be missing"
-
-# generate AdbWinApi stub library
-#$(LOCAL_PATH)/AdbWinApi.a: $(LOCAL_PATH)/AdbWinApi.def
-#	dlltool --def $(LOCAL_PATH)/AdbWinApi.def --dllname AdbWinApi.dll --output-lib $(LOCAL_PATH)/AdbWinApi.a
-
-include $(BUILD_HOST_PREBUILT)
+include $(CLEAR_VARS)
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE := AdbWinUsbApi
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_SRC_FILES_x86 := AdbWinUsbApi.dll
+LOCAL_MODULE_SUFFIX := .dll
+LOCAL_MULTILIB := 32
+include $(BUILD_PREBUILT)