diff options
| author | Ying Wang <wangying@google.com> | 2014-05-20 15:46:57 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-05-20 17:59:48 -0700 |
| commit | 3bc8fd9e50702a2d48461ac49251b590d05deda0 (patch) | |
| tree | f63d80323f7d1340db8a157c8364f50894763d85 /host | |
| parent | bf164835e6be681afb50ca70ee65639ca44fd64f (diff) | |
| download | android_development-3bc8fd9e50702a2d48461ac49251b590d05deda0.tar.gz android_development-3bc8fd9e50702a2d48461ac49251b590d05deda0.tar.bz2 android_development-3bc8fd9e50702a2d48461ac49251b590d05deda0.zip | |
Host multilib build.
Bug: 13751317
Change-Id: I05ad98c1f3f55e3288fbcc169311a7685b872fd9
Diffstat (limited to 'host')
| -rw-r--r-- | host/windows/prebuilt/usb/Android.mk | 42 |
1 files 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 - -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 $(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) -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) |