commit 818806ad59ac09d5ee7de52891fa113ef614dbe0
author Raphael <raphael@google.com> Wed Aug 12 12:04:07 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 12 12:04:07 2009 -0700
tree fe774afcf5949ced1593e4e18b91ccf2f71176fc
parent 665ad087aedf57ba45cad5472d1adb9948cbe6ae
parent e3baafd85a5fecd1714441455e3f75f26b5c381e

am e3baafd8: BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK

Merge commit 'e3baafd85a5fecd1714441455e3f75f26b5c381e'

* commit 'e3baafd85a5fecd1714441455e3f75f26b5c381e':
  BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index d6bda33..f3eaa6e 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -53,7 +53,7 @@
 	$(USB_SRCS) \
 	shlist.c \
 	utils.c \
-	usb_vendors.c \
+	usb_vendors.c
 
 
 ifneq ($(USE_SYSDEPS_WIN32),)
@@ -76,7 +76,9 @@
 $(call dist-for-goals,droid,$(LOCAL_BUILT_MODULE))
 
 ifeq ($(HOST_OS),windows)
-$(LOCAL_INSTALLED_MODULE): $(HOST_OUT_EXECUTABLES)/AdbWinApi.dll
+$(LOCAL_INSTALLED_MODULE): \
+    $(HOST_OUT_EXECUTABLES)/AdbWinApi.dll \
+    $(HOST_OUT_EXECUTABLES)/AdbWinUsbApi.dll
 endif
 
 
@@ -113,7 +115,7 @@
 	remount_service.c \
 	usb_linux_client.c \
 	log_service.c \
-	utils.c \
+	utils.c
 
 LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter
 LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE