Merge change 877 into donut
* changes: adb seems to build in 64 bit mode these days, so it's safe to build for the simulator too. While adb is not needed for the simulator, it's handy to have around when you're working with the simulator but need to look at a device.
This commit is contained in:
commit
feb3d6d8db
|
@ -7,7 +7,6 @@ LOCAL_PATH:= $(call my-dir)
|
|||
|
||||
# adb host tool
|
||||
# =========================================================
|
||||
ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean (also unused with the sim)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
# Default to a virtual (sockets) usb interface
|
||||
|
@ -77,7 +76,6 @@ ifeq ($(HOST_OS),windows)
|
|||
$(LOCAL_INSTALLED_MODULE): $(HOST_OUT_EXECUTABLES)/AdbWinApi.dll
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
# adbd device daemon
|
||||
# =========================================================
|
||||
|
|
Loading…
Reference in New Issue