commit 16c3f9efd18c3d94f8e7a555f16a18f3ca60be58
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 19 17:57:20 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 19 17:57:20 2021 +0000
tree 569cbb4046ae53664eabc7064952414546351113
parent d4e035e2043972fb1eda0c895f699fd683b68765
parent 4a65459145b9e55d7ab755e7fd1bbea1f8f79cac

Merge "pvm_exec: Set up Android logger"

compos/Android.bp

diff --git a/compos/Android.bp b/compos/Android.bp
index faf9576..6705ea8 100644
--- a/compos/Android.bp
+++ b/compos/Android.bp
@@ -7,6 +7,7 @@
     srcs: ["src/pvm_exec.rs"],
     rustlibs: [
         "compos_aidl_interface-rust",
+        "libandroid_logger",
         "libanyhow",
         "libbinder_rpc_unstable_bindgen",
         "libbinder_rs",

compos/src/pvm_exec.rs

diff --git a/compos/src/pvm_exec.rs b/compos/src/pvm_exec.rs
index 2218d10..69eebbf 100644
--- a/compos/src/pvm_exec.rs
+++ b/compos/src/pvm_exec.rs
@@ -166,6 +166,12 @@
 }
 
 fn main() -> Result<()> {
+    let debuggable = env!("TARGET_BUILD_VARIANT") != "user";
+    let log_level = if debuggable { log::Level::Trace } else { log::Level::Info };
+    android_logger::init_once(
+        android_logger::Config::default().with_tag("pvm_exec").with_min_level(log_level),
+    );
+
     // 1. Parse the command line arguments for collect execution data.
     let Config { args, metadata, cid, debuggable } = parse_args()?;