commit fa22bb0ed84d9470cff46145ddd905979b46c99d
author Seungjae Yoo <seungjaeyoo@google.com> Thu Dec 08 16:38:42 2022 +0900
committer Seungjae Yoo <seungjaeyoo@google.com> Thu Dec 08 16:38:42 2022 +0900
tree 6723f883b28b7f0364155d27fcc2ac7ca8361a25
parent 4f4219c1ac5637b9fa7546ae9dbbabb422e9cba3

Remove DEBUG_LEVEL_APP_ONLY

Bug: 260147409, 203369076
Test: atest MicrodroidHostTestCases;
atest MicrodroidTestApp;
atest ComposHostTestCases

Change-Id: Ia12019519766a01495ce4305ea8029e11317ca7d

compos/common/compos_client.rs

diff --git a/compos/common/compos_client.rs b/compos/common/compos_client.rs
index 601c6fc..34be1d5 100644
--- a/compos/common/compos_client.rs
+++ b/compos/common/compos_client.rs
@@ -97,11 +97,7 @@
             };
         let config_path = get_vm_config_path(has_system_ext, parameters.prefer_staged);
 
-        let debug_level = match (protected_vm, parameters.debug_mode) {
-            (_, true) => DebugLevel::FULL,
-            (false, false) => DebugLevel::APP_ONLY,
-            (true, false) => DebugLevel::NONE,
-        };
+        let debug_level = if parameters.debug_mode { DebugLevel::FULL } else { DebugLevel::NONE };
 
         let (console_fd, log_fd) = if debug_level == DebugLevel::NONE {
             (None, None)

compos/src/compilation.rs

diff --git a/compos/src/compilation.rs b/compos/src/compilation.rs
index 2872d95..10eca96 100644
--- a/compos/src/compilation.rs
+++ b/compos/src/compilation.rs
@@ -43,8 +43,8 @@
 fn validate_args(args: &OdrefreshArgs) -> Result<()> {
     if args.compilationMode != CompilationMode::NORMAL_COMPILE {
         // Conservatively check debuggability.
-        let debuggable = system_properties::read_bool("ro.boot.microdroid.app_debuggable", false)
-            .unwrap_or(false);
+        let debuggable =
+            system_properties::read_bool("ro.boot.microdroid.debuggable", false).unwrap_or(false);
         if !debuggable {
             bail!("Requested compilation mode only available in debuggable VMs");
         }