Remove references to android14-6.1-pkvm_experimental

Bug: 352009226
Test: presubmit
Change-Id: I491c187a6aa919344a5e512bb3e96e6f181f11f9
diff --git a/apex/Android.bp b/apex/Android.bp
index da17040..5e74aca 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -35,7 +35,6 @@
 soong_config_string_variable {
     name: "avf_microdroid_guest_gki_version",
     values: [
-        "android14_61_pkvm_experimental",
         "android15_66",
     ],
 }
@@ -168,14 +167,6 @@
     ],
     soong_config_variables: {
         avf_microdroid_guest_gki_version: {
-            android14_61_pkvm_experimental: {
-                prebuilts: [
-                    "microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable",
-                    "microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal",
-                    "microdroid_gki-android14-6.1-pkvm_experimental_kernel",
-                    "microdroid_gki-android14-6.1-pkvm_experimental.json",
-                ],
-            },
             android15_66: {
                 prebuilts: [
                     "microdroid_gki-android15-6.6_initrd_debuggable",
diff --git a/apex/sign_virt_apex.py b/apex/sign_virt_apex.py
index 1a59894..4a19c3d 100644
--- a/apex/sign_virt_apex.py
+++ b/apex/sign_virt_apex.py
@@ -498,7 +498,7 @@
     RunCommand(args, cmd)
 
 
-gki_versions = ['android14-6.1-pkvm_experimental', 'android15-6.6']
+gki_versions = ['android15-6.6']
 
 # dict of (key, file) for re-sign/verification. keys are un-versioned for readability.
 virt_apex_non_gki_files = {
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index d4158d4..289bc82 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -579,74 +579,6 @@
 }
 
 ///////////////////////////////////////
-// GKI-android14-6.1-pkvm_experimental modules
-///////////////////////////////////////
-prebuilt_etc {
-    name: "microdroid_gki-android14-6.1-pkvm_experimental.json",
-    src: "microdroid_gki-android14-6.1-pkvm_experimental.json",
-}
-
-avb_add_hash_footer {
-    name: "microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed",
-    defaults: ["microdroid_kernel_signed_defaults"],
-    filename: "microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed",
-    arch: {
-        arm64: {
-            src: ":microdroid_gki_kernel_prebuilts-6.1-pkvm_experimental-arm64",
-        },
-        x86_64: {
-            src: ":microdroid_gki_kernel_prebuilts-6.1-pkvm_experimental-x86_64",
-        },
-    },
-    include_descriptors_from_images: [
-        ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_hashdesc",
-        ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_debug_hashdesc",
-    ],
-}
-
-// HACK: use cc_genrule for arch-specific properties
-cc_genrule {
-    name: "microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed-lz4",
-    out: ["microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed-lz4"],
-    srcs: [":empty_file"],
-    arch: {
-        arm64: {
-            srcs: [":microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed"],
-            exclude_srcs: [":empty_file"],
-        },
-    },
-    tools: ["lz4"],
-    cmd: "$(location lz4) -9 $(in) $(out)",
-}
-
-prebuilt_etc {
-    name: "microdroid_gki-android14-6.1-pkvm_experimental_kernel",
-    filename: "microdroid_gki-android14-6.1-pkvm_experimental_kernel",
-    src: ":empty_file",
-    relative_install_path: "fs",
-    arch: {
-        arm64: {
-            src: ":microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed-lz4",
-        },
-        x86_64: {
-            src: ":microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed",
-        },
-    },
-}
-
-avb_gen_vbmeta_image {
-    name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_hashdesc",
-    defaults: ["microdroid_initrd_normal_defaults"],
-    src: ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal",
-}
-
-avb_gen_vbmeta_image {
-    name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_debug_hashdesc",
-    defaults: ["microdroid_initrd_debug_defaults"],
-    src: ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable",
-}
-
-///////////////////////////////////////
 // GKI-android15-6.6
 ///////////////////////////////////////
 prebuilt_etc {
@@ -726,13 +658,11 @@
     arch: {
         arm64: {
             srcs: [
-                ":microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed",
                 ":microdroid_gki-android15-6.6_kernel_signed",
             ],
         },
         x86_64: {
             srcs: [
-                ":microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed",
                 ":microdroid_gki-android15-6.6_kernel_signed",
             ],
         },
diff --git a/microdroid/initrd/Android.bp b/microdroid/initrd/Android.bp
index 9bb4657..9904511 100644
--- a/microdroid/initrd/Android.bp
+++ b/microdroid/initrd/Android.bp
@@ -41,17 +41,6 @@
 }
 
 genrule {
-    name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_gen_arm64",
-    srcs: [
-        ":microdroid_ramdisk",
-        ":microdroid_first_stage_ramdisk",
-        ":microdroid_gki_modules-6.1-pkvm_experimental-arm64",
-    ],
-    out: ["microdroid_initrd.img"],
-    cmd: "cat $(in) > $(out)",
-}
-
-genrule {
     name: "microdroid_gki-android15-6.6_initrd_gen_arm64",
     srcs: [
         ":microdroid_ramdisk",
@@ -63,17 +52,6 @@
 }
 
 genrule {
-    name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_gen_x86_64",
-    srcs: [
-        ":microdroid_ramdisk",
-        ":microdroid_first_stage_ramdisk",
-        ":microdroid_gki_modules-6.1-pkvm_experimental-x86_64",
-    ],
-    out: ["microdroid_initrd.img"],
-    cmd: "cat $(in) > $(out)",
-}
-
-genrule {
     name: "microdroid_gki-android15-6.6_initrd_gen_x86_64",
     srcs: [
         ":microdroid_ramdisk",
@@ -118,17 +96,6 @@
 }
 
 genrule {
-    name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable_arm64",
-    tools: ["initrd_bootconfig"],
-    srcs: [
-        ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_gen_arm64",
-        ":microdroid_bootconfig_debuggable_src",
-    ] + bootconfigs_arm64,
-    out: ["microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable_arm64"],
-    cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
-}
-
-genrule {
     name: "microdroid_gki-android15-6.6_initrd_debuggable_arm64",
     tools: ["initrd_bootconfig"],
     srcs: [
@@ -151,17 +118,6 @@
 }
 
 genrule {
-    name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable_x86_64",
-    tools: ["initrd_bootconfig"],
-    srcs: [
-        ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_gen_x86_64",
-        ":microdroid_bootconfig_debuggable_src",
-    ] + bootconfigs_x86_64,
-    out: ["microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable_x86_64"],
-    cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
-}
-
-genrule {
     name: "microdroid_gki-android15-6.6_initrd_debuggable_x86_64",
     tools: ["initrd_bootconfig"],
     srcs: [
@@ -184,17 +140,6 @@
 }
 
 genrule {
-    name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_arm64",
-    tools: ["initrd_bootconfig"],
-    srcs: [
-        ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_gen_arm64",
-        ":microdroid_bootconfig_normal_src",
-    ] + bootconfigs_arm64,
-    out: ["microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_arm64"],
-    cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
-}
-
-genrule {
     name: "microdroid_gki-android15-6.6_initrd_normal_arm64",
     tools: ["initrd_bootconfig"],
     srcs: [
@@ -217,17 +162,6 @@
 }
 
 genrule {
-    name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_x86_64",
-    tools: ["initrd_bootconfig"],
-    srcs: [
-        ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_gen_x86_64",
-        ":microdroid_bootconfig_normal_src",
-    ] + bootconfigs_x86_64,
-    out: ["microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_x86_64"],
-    cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
-}
-
-genrule {
     name: "microdroid_gki-android15-6.6_initrd_normal_x86_64",
     tools: ["initrd_bootconfig"],
     srcs: [
@@ -254,21 +188,6 @@
 }
 
 prebuilt_etc {
-    name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable",
-    // We don't have ramdisk for architectures other than x86_64 & arm64
-    src: ":empty_file",
-    arch: {
-        x86_64: {
-            src: ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable_x86_64",
-        },
-        arm64: {
-            src: ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable_arm64",
-        },
-    },
-    filename: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable.img",
-}
-
-prebuilt_etc {
     name: "microdroid_gki-android15-6.6_initrd_debuggable",
     // We don't have ramdisk for architectures other than x86_64 & arm64
     src: ":empty_file",
@@ -299,21 +218,6 @@
 }
 
 prebuilt_etc {
-    name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal",
-    // We don't have ramdisk for architectures other than x86_64 & arm64
-    src: ":empty_file",
-    arch: {
-        x86_64: {
-            src: ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_x86_64",
-        },
-        arm64: {
-            src: ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_arm64",
-        },
-    },
-    filename: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal.img",
-}
-
-prebuilt_etc {
     name: "microdroid_gki-android15-6.6_initrd_normal",
     // We don't have ramdisk for architectures other than x86_64 & arm64
     src: ":empty_file",
diff --git a/microdroid/microdroid_gki-android14-6.1-pkvm_experimental.json b/microdroid/microdroid_gki-android14-6.1-pkvm_experimental.json
deleted file mode 100644
index 4e58573..0000000
--- a/microdroid/microdroid_gki-android14-6.1-pkvm_experimental.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "kernel": "/apex/com.android.virt/etc/fs/microdroid_gki-android14-6.1-pkvm_experimental_kernel",
-  "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,
-  "platform_version": "~1.0"
-}
diff --git a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
index de80ac8..91ff4d8 100644
--- a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
+++ b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
@@ -15,10 +15,10 @@
  */
 package com.android.microdroid.test.device;
 
-import static android.content.pm.PackageManager.FEATURE_VIRTUALIZATION_FRAMEWORK;
-import static android.content.pm.PackageManager.FEATURE_WATCH;
 import static android.content.pm.PackageManager.FEATURE_AUTOMOTIVE;
 import static android.content.pm.PackageManager.FEATURE_LEANBACK;
+import static android.content.pm.PackageManager.FEATURE_VIRTUALIZATION_FRAMEWORK;
+import static android.content.pm.PackageManager.FEATURE_WATCH;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.TruthJUnit.assume;
@@ -71,8 +71,7 @@
 
     protected static final String KERNEL_VERSION = SystemProperties.get("ro.kernel.version");
     protected static final Set<String> SUPPORTED_GKI_VERSIONS =
-            Collections.unmodifiableSet(
-                    new HashSet(Arrays.asList("android14-6.1-pkvm_experimental", "android15-6.6")));
+            Collections.unmodifiableSet(new HashSet(Arrays.asList("android15-6.6")));
 
     public static boolean isCuttlefish() {
         return getDeviceProperties().isCuttlefish();
diff --git a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
index 432f5e6..cd90fbe 100644
--- a/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
+++ b/tests/hostside/helper/java/com/android/microdroid/test/host/MicrodroidHostTestCaseBase.java
@@ -71,8 +71,7 @@
                 / MICRODROID_COMMAND_RETRY_INTERVAL_MILLIS);
 
     protected static final Set<String> SUPPORTED_GKI_VERSIONS =
-            Collections.unmodifiableSet(
-                    new HashSet(Arrays.asList("android14-6.1-pkvm_experimental", "android15-6.6")));
+            Collections.unmodifiableSet(new HashSet(Arrays.asList("android15-6.6")));
 
     /* Keep this sync with AssignableDevice.aidl */
     public static final class AssignableDevice {