diff options
| author | Raphael <raphael@google.com> | 2009-08-12 12:04:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-12 12:04:07 -0700 |
| commit | 818806ad59ac09d5ee7de52891fa113ef614dbe0 (patch) | |
| tree | fe774afcf5949ced1593e4e18b91ccf2f71176fc | |
| parent | 665ad087aedf57ba45cad5472d1adb9948cbe6ae (diff) | |
| parent | e3baafd85a5fecd1714441455e3f75f26b5c381e (diff) | |
| download | system_core-818806ad59ac09d5ee7de52891fa113ef614dbe0.tar.gz system_core-818806ad59ac09d5ee7de52891fa113ef614dbe0.tar.bz2 system_core-818806ad59ac09d5ee7de52891fa113ef614dbe0.zip | |
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
| -rw-r--r-- | adb/Android.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index d6bda332..f3eaa6e0 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -53,7 +53,7 @@ LOCAL_SRC_FILES := \ $(USB_SRCS) \ shlist.c \ utils.c \ - usb_vendors.c \ + usb_vendors.c ifneq ($(USE_SYSDEPS_WIN32),) @@ -76,7 +76,9 @@ include $(BUILD_HOST_EXECUTABLE) $(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 @@ LOCAL_SRC_FILES := \ 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 |