From e67ec453a6776bbb354b00a3b0477334a43dd543 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 21 May 2015 13:58:50 -0700 Subject: 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 --- client/main.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'client/main.cpp') 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(argv + 1)); } -- cgit v1.2.3