commit c89e0ccd40624e8b2ce30d425e8bed0264fae548
author Dan Albert <danalbert@google.com> Fri May 08 16:13:53 2015 -0700
committer Dan Albert <danalbert@google.com> Fri May 08 17:33:21 2015 -0700
tree f9d610478136f559b7f2f3020eac5eeb072496a2
parent 8398386a6381d6d1d597cd5c5cecf9a2b11ea104

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

This reverts commit 218dbccefa3d874d988e4784bda5e45b7643cb5a.

Change-Id: I74088db34983dc99e316a07c6ddc294340e0eb71

adb/Android.mk

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