Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit feb3d6d8 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

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.
parents 95ec9838 b9e966f5
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -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
# =========================================================