diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-01 08:51:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-01 08:51:05 -0700 |
| commit | feb3d6d8db30f51c560e792ef3d9eca01d9cae9d (patch) | |
| tree | 726e2e9623b4b2d83a55e93bf479e4c82ceece64 | |
| parent | 95ec983887867a117f4ef87073495111aff4a506 (diff) | |
| parent | b9e966f56b217bfd90ac0a0ee0dda11b5425dbbb (diff) | |
| download | system_core-feb3d6d8db30f51c560e792ef3d9eca01d9cae9d.zip system_core-feb3d6d8db30f51c560e792ef3d9eca01d9cae9d.tar.gz system_core-feb3d6d8db30f51c560e792ef3d9eca01d9cae9d.tar.bz2 | |
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.
| -rw-r--r-- | adb/Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
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 @@ 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 # ========================================================= |