Revert "Add microdroid_16k kernel"
Revert submission 3323102
Reason for revert: DroidMonitor: Potential culprit for http://b/376483022 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted changes: /q/submissionid:3323102
Change-Id: I99f70ac44db09be86b55e37bf3a7addecec57cb3
diff --git a/android/virtmgr/src/aidl.rs b/android/virtmgr/src/aidl.rs
index c1b4d86..5dac07f 100644
--- a/android/virtmgr/src/aidl.rs
+++ b/android/virtmgr/src/aidl.rs
@@ -2237,14 +2237,6 @@
}
#[test]
- fn test_extract_os_name_from_microdroid_16k_config() -> Result<()> {
- test_extract_os_name_from_config_path(
- Path::new("/apex/com.android.virt/etc/microdroid_16k.json"),
- Some("microdroid_16k"),
- )
- }
-
- #[test]
fn test_extract_os_name_from_microdroid_gki_config() -> Result<()> {
test_extract_os_name_from_config_path(
Path::new("/apex/com.android.virt/etc/microdroid_gki-android14-6.1.json"),
diff --git a/android/virtmgr/src/payload.rs b/android/virtmgr/src/payload.rs
index 244e112..5811314 100644
--- a/android/virtmgr/src/payload.rs
+++ b/android/virtmgr/src/payload.rs
@@ -449,8 +449,6 @@
DebugLevel::FULL => "debuggable",
_ => return Err(anyhow!("unsupported debug level: {:?}", config.debugLevel)),
};
- // TODO(ioffe): generalise this
- let os_name = if os_name == "microdroid_16k" { "microdroid" } else { os_name };
let initrd = format!("/apex/com.android.virt/etc/{os_name}_initrd_{debug_suffix}.img");
vm_config.initrd = Some(open_parcel_file(Path::new(&initrd), false)?);
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 6090b6f..b0ecdde 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -159,12 +159,6 @@
}) + select(release_flag("RELEASE_AVF_ENABLE_NETWORK"), {
true: ["com.android.virt.vmnic.rc"],
default: [],
- }) + select(soong_config_variable("ANDROID", "target_boots_16k"), {
- true: [
- "microdroid_16k.json",
- "microdroid_kernel_16k",
- ],
- default: [],
}),
host_required: [
"vm_shell",
diff --git a/build/microdroid/Android.bp b/build/microdroid/Android.bp
index 6fa15fe..abb97da 100644
--- a/build/microdroid/Android.bp
+++ b/build/microdroid/Android.bp
@@ -377,11 +377,6 @@
}
prebuilt_etc {
- name: "microdroid_16k.json",
- src: "microdroid_16k.json",
-}
-
-prebuilt_etc {
name: "microdroid_manifest",
src: "microdroid_manifest.xml",
filename: "manifest.xml",
@@ -512,29 +507,6 @@
],
}
-avb_add_hash_footer {
- name: "microdroid_kernel_16k_signed",
- defaults: ["microdroid_kernel_signed_defaults"],
- filename: "microdroid_kernel_16k",
- arch: {
- arm64: {
- src: ":microdroid_kernel_16k_prebuilt-arm64",
- },
- },
- include_descriptors_from_images: [
- ":microdroid_initrd_normal_hashdesc",
- ":microdroid_initrd_debug_hashdesc",
- ],
- // Currently x86_64 arch doesn't support building 16k kernels, meaning that
- // we don't have microdroid_16k kernel prebuilts in x86_64.
- // We need to disable this module on x86_64 products, otherwise checkbuild
- // will complain.
- enabled: select(soong_config_variable("ANDROID", "target_boots_16k"), {
- true: true,
- default: false,
- }),
-}
-
prebuilt_etc {
name: "microdroid_kernel",
src: ":empty_file",
@@ -549,23 +521,6 @@
},
}
-prebuilt_etc {
- name: "microdroid_kernel_16k",
- src: ":empty_file",
- relative_install_path: "fs",
- arch: {
- arm64: {
- src: ":microdroid_kernel_16k_signed",
- },
- },
- // The microdroid_kernel_16k_signed is only enabled for products that set
- // TARGET_BOOTS_16K, so we also need to conditionally enable this module.
- enabled: select(soong_config_variable("ANDROID", "target_boots_16k"), {
- true: true,
- default: false,
- }),
-}
-
///////////////////////////////////////
// GKI-android15-6.6
///////////////////////////////////////
diff --git a/build/microdroid/microdroid_16k.json b/build/microdroid/microdroid_16k.json
deleted file mode 100644
index ba6a949..0000000
--- a/build/microdroid/microdroid_16k.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "kernel": "/apex/com.android.virt/etc/fs/microdroid_kernel_16k",
- "disks": [
- {
- "partitions": [
- {
- "label": "vbmeta_a",
- "path": "/apex/com.android.virt/etc/fs/microdroid_vbmeta.img"
- },
- {
- "label": "super",
- "path": "/apex/com.android.virt/etc/fs/microdroid_super.img"
- }
- ],
- "writable": false
- }
- ],
- "memory_mib": 256,
- "console_input_device": "hvc0",
- "platform_version": "~1.0"
-}
diff --git a/guest/kernel/Android.bp b/guest/kernel/Android.bp
index d3249f6..8c6cccb 100644
--- a/guest/kernel/Android.bp
+++ b/guest/kernel/Android.bp
@@ -43,12 +43,3 @@
default: [],
}),
}
-
-filegroup {
- name: "microdroid_kernel_16k_prebuilt-arm64",
- // Below are properties that are conditionally set depending on value of build flags.
- srcs: select(release_flag("RELEASE_AVF_MICRODROID_KERNEL_VERSION"), {
- "android15_66": ["android15-6.6/arm64/16k/kernel-6.6"],
- default: [],
- }),
-}