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

Commit 318897a5 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am feb3d6d8: Merge change 877 into donut 

Merge commit 'feb3d6d8'

* commit 'feb3d6d8':
  adb seems to build in 64 bit mode these days, so it's safe to build for the simulator too.
parents b55cf93e feb3d6d8

adb/Android.mk

+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

# =========================================================