Remove DEBUG_LEVEL_APP_ONLY
Bug: 260147409, 203369076
Test: atest MicrodroidHostTestCases;
atest MicrodroidTestApp;
atest ComposHostTestCases
Change-Id: Ia12019519766a01495ce4305ea8029e11317ca7d
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 79378fe..0b3f7a6 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -373,15 +373,6 @@
}
avb_add_hash_footer {
- name: "microdroid_bootconfig_app_debuggable",
- src: "bootconfig.app_debuggable",
- filename: "microdroid_bootconfig.app_debuggable",
- partition_name: "bootconfig",
- private_key: ":microdroid_sign_key",
- salt: bootconfig_salt,
-}
-
-avb_add_hash_footer {
name: "microdroid_bootconfig_full_debuggable",
src: "bootconfig.full_debuggable",
filename: "microdroid_bootconfig.full_debuggable",
@@ -540,11 +531,6 @@
}
filegroup {
- name: "microdroid_bootconfig_app_debuggable_src",
- srcs: ["bootconfig.app_debuggable"],
-}
-
-filegroup {
name: "microdroid_bootconfig_normal_src",
srcs: ["bootconfig.normal"],
}
diff --git a/microdroid/bootconfig.app_debuggable b/microdroid/bootconfig.app_debuggable
deleted file mode 100644
index 529ed07..0000000
--- a/microdroid/bootconfig.app_debuggable
+++ /dev/null
@@ -1,14 +0,0 @@
-# The app is debuggable.
-androidboot.microdroid.app_debuggable=1
-
-# TODO(b/203369076) This should be 0 to disable adb rooting. For now, we can't do that because
-# if this is set to 0, adbd enforces the host authentication but we don't put the adb
-# public key (which represents the owner) in the VM yet.
-androidboot.microdroid.debuggable=0
-
-# Console output is not redirect to the host-side.
-kernel.printk.devkmsg=off
-kernel.console=ttynull
-
-# ADB is supported but rooting is prohibited.
-androidboot.adb.enabled=1
diff --git a/microdroid/bootconfig.full_debuggable b/microdroid/bootconfig.full_debuggable
index 583060b..0d0457c 100644
--- a/microdroid/bootconfig.full_debuggable
+++ b/microdroid/bootconfig.full_debuggable
@@ -1,6 +1,3 @@
-# The app is debuggable as full_debuggable is a superser of app_debuggable.
-androidboot.microdroid.app_debuggable=1
-
# ro.debuggable is set.
androidboot.microdroid.debuggable=1
diff --git a/microdroid/bootconfig.normal b/microdroid/bootconfig.normal
index 5cc553c..9226ca1 100644
--- a/microdroid/bootconfig.normal
+++ b/microdroid/bootconfig.normal
@@ -1,6 +1,3 @@
-# The app is not debuggable.
-androidboot.microdroid.app_debuggable=0
-
# ro.debuggable is off
androidboot.microdroid.debuggable=0
diff --git a/microdroid/init.rc b/microdroid/init.rc
index 310cf2b..a48ba4b 100644
--- a/microdroid/init.rc
+++ b/microdroid/init.rc
@@ -19,10 +19,10 @@
# If VM is debuggable, send logs to outside ot the VM via the serial console.
# If non-debuggable, logs are internally consumed at /dev/null
-on early-init && property:ro.boot.microdroid.app_debuggable=1
+on early-init && property:ro.boot.microdroid.debuggable=1
setprop ro.log.file_logger.path /dev/hvc2
-on early-init && property:ro.boot.microdroid.app_debuggable=0
+on early-init && property:ro.boot.microdroid.debuggable=0
setprop ro.log.file_logger.path /dev/null
on init
diff --git a/microdroid/initrd/Android.bp b/microdroid/initrd/Android.bp
index eb761bf..8d7794d 100644
--- a/microdroid/initrd/Android.bp
+++ b/microdroid/initrd/Android.bp
@@ -72,28 +72,6 @@
}
genrule {
- name: "microdroid_initrd_app_debuggable_arm64",
- tools: ["initrd_bootconfig"],
- srcs: [
- ":microdroid_initrd_gen",
- ":microdroid_bootconfig_app_debuggable_src",
- ] + bootconfigs_arm64,
- out: ["microdroid_initrd_app_debuggable_arm64"],
- cmd: "$(location initrd_bootconfig) --output $(out) $(in)",
-}
-
-genrule {
- name: "microdroid_initrd_app_debuggable_x86_64",
- tools: ["initrd_bootconfig"],
- srcs: [
- ":microdroid_initrd_gen",
- ":microdroid_bootconfig_app_debuggable_src",
- ] + bootconfigs_x86_64,
- out: ["microdroid_initrd_app_debuggable_x86_64"],
- cmd: "$(location initrd_bootconfig) --output $(out) $(in)",
-}
-
-genrule {
name: "microdroid_initrd_normal_arm64",
tools: ["initrd_bootconfig"],
srcs: [
@@ -131,21 +109,6 @@
}
prebuilt_etc {
- name: "microdroid_initrd_app_debuggable",
- // We don't have ramdisk for architectures other than x86_64 & arm64
- src: "empty_file",
- arch: {
- x86_64: {
- src: ":microdroid_initrd_app_debuggable_x86_64",
- },
- arm64: {
- src: ":microdroid_initrd_app_debuggable_arm64",
- },
- },
- filename: "microdroid_initrd_app_debuggable.img",
-}
-
-prebuilt_etc {
name: "microdroid_initrd_normal",
// We don't have ramdisk for architectures other than x86_64 & arm64
src: "empty_file",
@@ -168,13 +131,6 @@
}
genrule {
- name: "microdroid_initrd_app_debuggable.sha256",
- srcs: [":microdroid_initrd_app_debuggable"],
- cmd: "cat $(in) | sha256sum | cut -d' ' -f1 > $(out)",
- out: ["hash"],
-}
-
-genrule {
name: "microdroid_initrd_full_debuggable.sha256",
srcs: [":microdroid_initrd_full_debuggable"],
cmd: "cat $(in) | sha256sum | cut -d' ' -f1 > $(out)",
@@ -185,7 +141,6 @@
name: "microdroid_initrd_hashes",
srcs: [
":microdroid_initrd_normal.sha256",
- ":microdroid_initrd_app_debuggable.sha256",
":microdroid_initrd_full_debuggable.sha256",
],
// join the hashes with commas