commit d9b74192b8351c99dc0baf53f6e652edb443d1d1
author David Pursell <dpursell@google.com> Sun Sep 06 01:18:47 2015 +0000
committer David Pursell <dpursell@google.com> Sun Sep 06 01:18:47 2015 +0000
tree dc32f6889122a9b35c1a5d56e38033e82806e15a
parent 73096f2e1d87da571187515af6aa7c2171a70693

Revert "adb: create shell protocol class."

This CL broke the mac build. I'll revert for now and take a look at how to get it working next week.

This reverts commit 73096f2e1d87da571187515af6aa7c2171a70693.

Change-Id: Icb3e015250bcbbc69a45675a1358699ebe01e77b

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 81d94ed..0ec7416 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -131,8 +131,6 @@
 LOCAL_SRC_FILES := \
     $(LIBADB_TEST_SRCS) \
     $(LIBADB_TEST_linux_SRCS) \
-    shell_service_protocol.cpp \
-    shell_service_protocol_test.cpp \
 
 LOCAL_SANITIZE := $(adb_target_sanitize)
 LOCAL_STATIC_LIBRARIES := libadbd
@@ -147,12 +145,7 @@
 LOCAL_CFLAGS := -DADB_HOST=1 $(LIBADB_CFLAGS)
 LOCAL_CFLAGS_windows := $(LIBADB_windows_CFLAGS)
 LOCAL_CFLAGS_linux := $(LIBADB_linux_CFLAGS)
-LOCAL_SRC_FILES := \
-    $(LIBADB_TEST_SRCS) \
-    services.cpp \
-    shell_service_protocol.cpp \
-    shell_service_protocol_test.cpp \
-
+LOCAL_SRC_FILES := $(LIBADB_TEST_SRCS) services.cpp
 LOCAL_SRC_FILES_linux := $(LIBADB_TEST_linux_SRCS)
 LOCAL_SRC_FILES_darwin := $(LIBADB_TEST_darwin_SRCS)
 LOCAL_SANITIZE := $(adb_host_sanitize)
@@ -208,7 +201,6 @@
     adb_client.cpp \
     services.cpp \
     file_sync_client.cpp \
-    shell_service_protocol.cpp \
 
 LOCAL_CFLAGS += \
     $(ADB_COMMON_CFLAGS) \
@@ -257,7 +249,6 @@
     remount_service.cpp \
     set_verity_enable_state_service.cpp \
     shell_service.cpp \
-    shell_service_protocol.cpp \
 
 LOCAL_CFLAGS := \
     $(ADB_COMMON_CFLAGS) \