Remove prefix full_ from debuggable
Bug: 260147409
Test: atest MicrodroidHostTestCases;
atest MicrodroidTestApp;
atest ComposHostTestCases
Change-Id: I881111fe75051b1bc9db00446ba959a28597ca79
diff --git a/apex/Android.bp b/apex/Android.bp
index e580cc2..579d7c7 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -4,7 +4,7 @@
microdroid_filesystem_images = [
"microdroid_boot",
- "microdroid_bootconfig_full_debuggable",
+ "microdroid_bootconfig_debuggable",
"microdroid_bootconfig_normal",
"microdroid_init_boot",
"microdroid_super",
@@ -92,7 +92,7 @@
prebuilts: [
"com.android.virt.init.rc",
"features_com.android.virt.xml",
- "microdroid_initrd_full_debuggable",
+ "microdroid_initrd_debuggable",
"microdroid_initrd_normal",
"microdroid.json",
"microdroid_bootloader",
diff --git a/apex/sign_virt_apex.py b/apex/sign_virt_apex.py
index 1d41543..4d83c5f 100644
--- a/apex/sign_virt_apex.py
+++ b/apex/sign_virt_apex.py
@@ -352,7 +352,7 @@
'vbmeta.img': 'etc/fs/microdroid_vbmeta.img',
'vbmeta_bootconfig.img': 'etc/fs/microdroid_vbmeta_bootconfig.img',
'bootconfig.normal': 'etc/fs/microdroid_bootconfig.normal',
- 'bootconfig.full_debuggable': 'etc/fs/microdroid_bootconfig.full_debuggable',
+ 'bootconfig.debuggable': 'etc/fs/microdroid_bootconfig.debuggable',
'uboot_env.img': 'etc/fs/uboot_env.img'
}
@@ -399,7 +399,7 @@
# Re-sign bootconfigs and the uboot_env with the same key
bootconfig_sign_key = key
Async(AddHashFooter, args, bootconfig_sign_key, files['bootconfig.normal'])
- Async(AddHashFooter, args, bootconfig_sign_key, files['bootconfig.full_debuggable'])
+ Async(AddHashFooter, args, bootconfig_sign_key, files['bootconfig.debuggable'])
Async(AddHashFooter, args, bootconfig_sign_key, files['uboot_env.img'])
# Re-sign vbmeta_bootconfig with chained_partitions to "bootconfig" and
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 0b3f7a6..a8290da 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -373,9 +373,9 @@
}
avb_add_hash_footer {
- name: "microdroid_bootconfig_full_debuggable",
- src: "bootconfig.full_debuggable",
- filename: "microdroid_bootconfig.full_debuggable",
+ name: "microdroid_bootconfig_debuggable",
+ src: "bootconfig.debuggable",
+ filename: "microdroid_bootconfig.debuggable",
partition_name: "bootconfig",
private_key: ":microdroid_sign_key",
salt: bootconfig_salt,
@@ -526,8 +526,8 @@
}
filegroup {
- name: "microdroid_bootconfig_full_debuggable_src",
- srcs: ["bootconfig.full_debuggable"],
+ name: "microdroid_bootconfig_debuggable_src",
+ srcs: ["bootconfig.debuggable"],
}
filegroup {
diff --git a/microdroid/bootconfig.full_debuggable b/microdroid/bootconfig.debuggable
similarity index 100%
rename from microdroid/bootconfig.full_debuggable
rename to microdroid/bootconfig.debuggable
diff --git a/microdroid/initrd/Android.bp b/microdroid/initrd/Android.bp
index 8d7794d..d05ea86 100644
--- a/microdroid/initrd/Android.bp
+++ b/microdroid/initrd/Android.bp
@@ -50,24 +50,24 @@
]
genrule {
- name: "microdroid_initrd_full_debuggable_arm64",
+ name: "microdroid_initrd_debuggable_arm64",
tools: ["initrd_bootconfig"],
srcs: [
":microdroid_initrd_gen",
- ":microdroid_bootconfig_full_debuggable_src",
+ ":microdroid_bootconfig_debuggable_src",
] + bootconfigs_arm64,
- out: ["microdroid_initrd_full_debuggable_arm64"],
+ out: ["microdroid_initrd_debuggable_arm64"],
cmd: "$(location initrd_bootconfig) --output $(out) $(in)",
}
genrule {
- name: "microdroid_initrd_full_debuggable_x86_64",
+ name: "microdroid_initrd_debuggable_x86_64",
tools: ["initrd_bootconfig"],
srcs: [
":microdroid_initrd_gen",
- ":microdroid_bootconfig_full_debuggable_src",
+ ":microdroid_bootconfig_debuggable_src",
] + bootconfigs_x86_64,
- out: ["microdroid_initrd_full_debuggable_x86_64"],
+ out: ["microdroid_initrd_debuggable_x86_64"],
cmd: "$(location initrd_bootconfig) --output $(out) $(in)",
}
@@ -94,18 +94,18 @@
}
prebuilt_etc {
- name: "microdroid_initrd_full_debuggable",
+ name: "microdroid_initrd_debuggable",
// We don't have ramdisk for architectures other than x86_64 & arm64
src: "empty_file",
arch: {
x86_64: {
- src: ":microdroid_initrd_full_debuggable_x86_64",
+ src: ":microdroid_initrd_debuggable_x86_64",
},
arm64: {
- src: ":microdroid_initrd_full_debuggable_arm64",
+ src: ":microdroid_initrd_debuggable_arm64",
},
},
- filename: "microdroid_initrd_full_debuggable.img",
+ filename: "microdroid_initrd_debuggable.img",
}
prebuilt_etc {
@@ -131,8 +131,8 @@
}
genrule {
- name: "microdroid_initrd_full_debuggable.sha256",
- srcs: [":microdroid_initrd_full_debuggable"],
+ name: "microdroid_initrd_debuggable.sha256",
+ srcs: [":microdroid_initrd_debuggable"],
cmd: "cat $(in) | sha256sum | cut -d' ' -f1 > $(out)",
out: ["hash"],
}
@@ -141,7 +141,7 @@
name: "microdroid_initrd_hashes",
srcs: [
":microdroid_initrd_normal.sha256",
- ":microdroid_initrd_full_debuggable.sha256",
+ ":microdroid_initrd_debuggable.sha256",
],
// join the hashes with commas
cmd: "cat $(in) | tr '\n' ',' > $(out) && truncate -s -1 $(out)",
diff --git a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
index 5ce8f60..19ea117 100644
--- a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
@@ -334,7 +334,7 @@
}
// Add partitions to the second disk
- final String initrdPath = TEST_ROOT + "etc/microdroid_initrd_full_debuggable.img";
+ final String initrdPath = TEST_ROOT + "etc/microdroid_initrd_debuggable.img";
config.put("initrd", initrdPath);
// Add instance image as a partition in disks[1]
disks.put(new JSONObject()
diff --git a/virtualizationservice/src/payload.rs b/virtualizationservice/src/payload.rs
index f84cb86..eb3e9eb 100644
--- a/virtualizationservice/src/payload.rs
+++ b/virtualizationservice/src/payload.rs
@@ -405,7 +405,7 @@
) -> Result<()> {
let debug_suffix = match config.debugLevel {
DebugLevel::NONE => "normal",
- DebugLevel::FULL => "full_debuggable",
+ DebugLevel::FULL => "debuggable",
_ => return Err(anyhow!("unsupported debug level: {:?}", config.debugLevel)),
};
let initrd = format!("/apex/com.android.virt/etc/microdroid_initrd_{}.img", debug_suffix);