commit 218dbccefa3d874d988e4784bda5e45b7643cb5a
author Dan Albert <danalbert@google.com> Fri May 08 16:08:57 2015 -0700
committer Dan Albert <danalbert@google.com> Fri May 08 16:08:57 2015 -0700
tree 2c53ee1b0f321a632ca87412a550b451938980f7
parent 3e1cb6d98d54d38820de70bba07732ea87e84ffb

Revert "Split adb_main.cpp into client and daemon."

This reverts commit cf07494ac2a101c3afbe23a7d85121553f586cf7.

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 4ffb589..1aed2cb 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -175,7 +175,7 @@
 LOCAL_CLANG := $(adb_host_clang)
 
 LOCAL_SRC_FILES := \
-    client/main.cpp \
+    adb_main.cpp \
     console.cpp \
     commandline.cpp \
     adb_client.cpp \
@@ -227,7 +227,7 @@
 LOCAL_CLANG := true
 
 LOCAL_SRC_FILES := \
-    daemon/main.cpp \
+    adb_main.cpp \
     services.cpp \
     file_sync_service.cpp \
     framebuffer_service.cpp \