commit a5ad98cf45acabb0fbadb02c103bc4a69f2005f6
author Elliott Hughes <enh@google.com> Thu Oct 27 01:25:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 27 01:25:07 2016 +0000
tree d590d9ed808cde4adab5219d743ebe27255a27f0
parent 3f627c3544e904b5e3e00c57e2cd8fe720eb830e
parent 4a6e2bd886610693ca1510a0311465ec6bdb0083

Merge "Make "adb logcat" pass $ANDROID_LOG_TAGS through again." am: b838ff65d9 am: a4f497e0a2 am: 1cb40045df
am: 4e12ce3ed1

Change-Id: I6bd4bd4812f09098fc166df5e2dbd3a309dd5dca

adb/adb_trace.cpp

diff --git a/adb/adb_trace.cpp b/adb/adb_trace.cpp
index 369dec9..002d061 100644
--- a/adb/adb_trace.cpp
+++ b/adb/adb_trace.cpp
@@ -155,7 +155,24 @@
     }
 #endif
 
+#if !defined(_WIN32)
+    // adb historically ignored $ANDROID_LOG_TAGS but passed it through to logcat.
+    // If set, move it out of the way so that libbase logging doesn't try to parse it.
+    std::string log_tags;
+    char* ANDROID_LOG_TAGS = getenv("ANDROID_LOG_TAGS");
+    if (ANDROID_LOG_TAGS) {
+        log_tags = ANDROID_LOG_TAGS;
+        unsetenv("ANDROID_LOG_TAGS");
+    }
+#endif
+
     android::base::InitLogging(argv, &AdbLogger);
+
+#if !defined(_WIN32)
+    // Put $ANDROID_LOG_TAGS back so we can pass it to logcat.
+    if (!log_tags.empty()) setenv("ANDROID_LOG_TAGS", log_tags.c_str(), 1);
+#endif
+
     setup_trace_mask();
 
     VLOG(ADB) << adb_version();