commit 698e065e14840541f218a80241fa880703a7dbc5
author Felipe Leme <felipeal@google.com> Tue Jul 19 17:07:22 2016 -0700
committer Josh Gao <jmgao@google.com> Tue Aug 30 13:06:23 2016 -0700
tree 80608f70bb228676984d098e883e7112e066b66d
parent 248722e7eb8d184677b2d858d3309d7ce055e532

DO NOT MERGE: Split bugreport() into its own file and added unit tests.

bugreport() will be soon refactored to track progress, which will
require more comprehensive unit tests.

As such, it's better to move it to its own files, which in turn also
requires moving send_shell_command() and usage() to commandline.h.

Fixes: 30100363
Bug: 30268737

Change-Id: I3cdf114a0b5547293320042ff0749a60886440b0
(cherry picked from commit 78e0963e4bce9cc9f0bbf0b686004ba15b1e3929)
(cherry picked from commit 218e1ff75998052c7bb30b483c15e75a853283a8)

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 1aa3dc1..5a0780c 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -184,6 +184,9 @@
 LOCAL_CFLAGS_darwin := $(LIBADB_darwin_CFLAGS)
 LOCAL_SRC_FILES := \
     $(LIBADB_TEST_SRCS) \
+    adb_client.cpp \
+    bugreport.cpp \
+    bugreport_test.cpp \
     services.cpp \
     shell_service_protocol.cpp \
     shell_service_protocol_test.cpp \
@@ -199,6 +202,7 @@
     libcrypto \
     libcutils \
     libdiagnose_usb \
+    libgmock_host \
 
 # Set entrypoint to wmain from sysdeps_win32.cpp instead of main
 LOCAL_LDFLAGS_windows := -municode
@@ -227,6 +231,7 @@
 
 LOCAL_SRC_FILES := \
     adb_client.cpp \
+    bugreport.cpp \
     client/main.cpp \
     console.cpp \
     commandline.cpp \