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