Remove DEBUG_LEVEL_APP_ONLY
Bug: 260147409, 203369076
Test: atest MicrodroidHostTestCases;
atest MicrodroidTestApp;
atest ComposHostTestCases
Change-Id: Ia12019519766a01495ce4305ea8029e11317ca7d
diff --git a/microdroid_manager/src/main.rs b/microdroid_manager/src/main.rs
index 0e45461..3c490f4 100644
--- a/microdroid_manager/src/main.rs
+++ b/microdroid_manager/src/main.rs
@@ -76,7 +76,7 @@
"/sys/firmware/devicetree/base/virtualization/guest/debug-microdroid,no-verified-boot";
const APEX_CONFIG_DONE_PROP: &str = "apex_config.done";
-const APP_DEBUGGABLE_PROP: &str = "ro.boot.microdroid.app_debuggable";
+const DEBUGGABLE_PROP: &str = "ro.boot.microdroid.debuggable";
const APK_MOUNT_DONE_PROP: &str = "microdroid_manager.apk.mounted";
// SYNC WITH virtualizationservice/src/crosvm.rs
@@ -167,7 +167,7 @@
fn main() -> Result<()> {
// If debuggable, print full backtrace to console log with stdio_to_kmsg
- if system_properties::read_bool(APP_DEBUGGABLE_PROP, true)? {
+ if system_properties::read_bool(DEBUGGABLE_PROP, true)? {
env::set_var("RUST_BACKTRACE", "full");
}
@@ -281,12 +281,12 @@
}
}
- // Check app debuggability, conervatively assuming it is debuggable
- let app_debuggable = system_properties::read_bool(APP_DEBUGGABLE_PROP, true)?;
+ // Check debuggability, conservatively assuming it is debuggable
+ let debuggable = system_properties::read_bool(DEBUGGABLE_PROP, true)?;
// Send the details to diced
let hidden = verified_data.salt.clone().try_into().unwrap();
- dice.derive(code_hash, &config_desc, authority_hash, app_debuggable, hidden)
+ dice.derive(code_hash, &config_desc, authority_hash, debuggable, hidden)
}
fn encode_tstr(tstr: &str, buffer: &mut Vec<u8>) -> Result<()> {