ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Make "adb logcat" pass $ANDROID_LOG_TAGS through again."

Browse source
This commit is contained in:
Treehugger Robot 2016-10-27 01:02:56 +00:00 • committed by Gerrit Code Review
commit b838ff65d9
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
adb/adb_trace.cpp
View file

@ -155,7 +155,24 @@ void adb_trace_init(char** argv) {
} }
#endif #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); 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(); setup_trace_mask();
VLOG(ADB) << adb_version(); VLOG(ADB) << adb_version();