summaryrefslogtreecommitdiff
path: root/client/main.cpp
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-05-21 13:58:50 -0700
committerDan Albert <danalbert@google.com>2015-05-21 16:25:57 -0700
commite67ec453a6776bbb354b00a3b0477334a43dd543 (patch)
tree571e89b7fedd58a5092338223060c26ff8988cb0 /client/main.cpp
parentc37333d4648bd53c3cd2ca266730a1d97ea6d585 (diff)
downloadadb-e67ec453a6776bbb354b00a3b0477334a43dd543.tar.gz
Improve logging.
Any output from the LOG family will now go to stderr and logcat on the device. stderr is usually redirected to a log file, but that is now inhibited for adbd if being run from a tty (useful when debugging with the serial console). This also fixes sending logs to the file on device for the trace mask of "all". The "all" tag was specifically handled to return early from the function, preventing the file initialization from happening. Change-Id: Id253577bfd1500fbce92dbfba0f9be23dbfd5ee4
Diffstat (limited to 'client/main.cpp')
-rw-r--r--client/main.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/client/main.cpp b/client/main.cpp
index f48182d..0cd6670 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -176,9 +176,7 @@ int adb_main(int is_daemon, int server_port) {
int main(int argc, char** argv) {
adb_sysdeps_init();
-
- android::base::InitLogging(argv);
- adb_trace_init();
+ adb_trace_init(argv);
D("Handling commandline()\n");
return adb_commandline(argc - 1, const_cast<const char**>(argv + 1));
}