commit 073c8d2394309a40a398963df307551ba47ede45
author Josh Gao <jmgao@google.com> Mon Apr 20 19:22:05 2020 -0700
committer Josh Gao <jmgao@google.com> Tue Apr 21 17:57:29 2020 -0700
tree 319b3ac9475b7bc6eb345df7ffa7dc66910bf31d
parent f099105f07bb3fe2bae6655d24bc4007bef71300

adbd: improve coverage by compiling less code.

Test: ./coverage/gen_coverage.sh && ./coverage/report.sh
Change-Id: I26f823e2587435b7ec2c6ca05955adef5cfc23a0

adb/adb_trace.cpp

diff --git a/adb/adb_trace.cpp b/adb/adb_trace.cpp
index cea24fe..c579dde 100644
--- a/adb/adb_trace.cpp
+++ b/adb/adb_trace.cpp
@@ -89,18 +89,13 @@
 
 int adb_trace_mask;
 
-std::string get_trace_setting_from_env() {
+std::string get_trace_setting() {
+#if ADB_HOST
     const char* setting = getenv("ADB_TRACE");
     if (setting == nullptr) {
         setting = "";
     }
-
-    return std::string(setting);
-}
-
-std::string get_trace_setting() {
-#if ADB_HOST
-    return get_trace_setting_from_env();
+    return setting;
 #else
     return android::base::GetProperty("persist.adb.trace_mask", "");
 #endif