LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Host multilib build."

Browse Source
This commit is contained in:
Ying Wang
2014-05-23 21:28:25 +00:00
committed by Gerrit Code Review
parent bf164835e6 3bc8fd9e50
commit 8eaca3a30e
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
host/windows/prebuilt/usb/Android.mk
View File

@@ -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)