commit 318897a5c2c5b48c2da9c7e6a13f64eec9b4f190
author Android (Google) Code Review <android-gerrit@google.com> Fri May 01 08:52:14 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri May 01 08:52:14 2009 -0700
tree 3086a12c5d451fd6ff120406dd0f9aa2c31d31a7
parent b55cf93e2545521e613b4ce1c1f33d3a24f1a4cb
parent feb3d6d8db30f51c560e792ef3d9eca01d9cae9d

am feb3d6d: Merge change 877 into donut

Merge commit 'feb3d6d8db30f51c560e792ef3d9eca01d9cae9d'

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

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 2296610..c8606cf 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -7,7 +7,6 @@
 
 # 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 @@
 $(LOCAL_INSTALLED_MODULE): $(HOST_OUT_EXECUTABLES)/AdbWinApi.dll
 endif
 
-endif
 
 # adbd device daemon
 # =========================================================