Add -pkvm_experimental to the microdroid_gki_android14-6.1 artifacts
Current name suggests that android14-6.1 GKI can be run as guest, which
is not true. Resolve this confusion by explicitly specifying
-pkvm_experimental to the name, which points out that this image was
built from the android14-6.1-pkvm_experimental branch.
Bug: 329383978
Test: AVF presubmit
Test: vm run-microdroid --gki android14-6.1-pkvm_experimental
Change-Id: I0b93e0aacb9dde58c9a3c696d5a073e1800ec325
diff --git a/apex/Android.bp b/apex/Android.bp
index e6c809c..dfb979e 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -172,10 +172,10 @@
},
release_avf_enable_vendor_modules: {
prebuilts: [
- "microdroid_gki-android14-6.1_initrd_debuggable",
- "microdroid_gki-android14-6.1_initrd_normal",
- "microdroid_gki-android14-6.1_kernel",
- "microdroid_gki-android14-6.1.json",
+ "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",
],
},
release_avf_enable_remote_attestation: {
diff --git a/apex/sign_virt_apex.py b/apex/sign_virt_apex.py
index 7c59b54..55fe6d2 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']
+gki_versions = ['android14-6.1-pkvm_experimental']
# 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 33d98dc..98a541f 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -582,39 +582,39 @@
}
///////////////////////////////////////
-// GKI-android14-6.1 modules
+// GKI-android14-6.1-pkvm_experimental modules
///////////////////////////////////////
prebuilt_etc {
- name: "microdroid_gki-android14-6.1.json",
- src: "microdroid_gki-android14-6.1.json",
+ 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_kernel_signed",
+ name: "microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed",
defaults: ["microdroid_kernel_signed_defaults"],
- filename: "microdroid_gki-android14-6.1_kernel_signed",
+ filename: "microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed",
arch: {
arm64: {
- src: ":microdroid_gki_kernel_prebuilts-6.1-arm64",
+ src: ":microdroid_gki_kernel_prebuilts-6.1-pkvm_experimental-arm64",
},
x86_64: {
- src: ":microdroid_gki_kernel_prebuilts-6.1-x86_64",
+ src: ":microdroid_gki_kernel_prebuilts-6.1-pkvm_experimental-x86_64",
},
},
include_descriptors_from_images: [
- ":microdroid_gki-android14-6.1_initrd_normal_hashdesc",
- ":microdroid_gki-android14-6.1_initrd_debug_hashdesc",
+ ":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_kernel_signed-lz4",
- out: ["microdroid_gki-android14-6.1_kernel_signed-lz4"],
+ 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_kernel_signed"],
+ srcs: [":microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed"],
exclude_srcs: [":empty_file"],
},
},
@@ -623,30 +623,30 @@
}
prebuilt_etc {
- name: "microdroid_gki-android14-6.1_kernel",
- filename: "microdroid_gki-android14-6.1_kernel",
+ 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_kernel_signed-lz4",
+ src: ":microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed-lz4",
},
x86_64: {
- src: ":microdroid_gki-android14-6.1_kernel_signed",
+ src: ":microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed",
},
},
}
avb_gen_vbmeta_image {
- name: "microdroid_gki-android14-6.1_initrd_normal_hashdesc",
+ name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_hashdesc",
defaults: ["microdroid_initrd_normal_defaults"],
- src: ":microdroid_gki-android14-6.1_initrd_normal",
+ src: ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal",
}
avb_gen_vbmeta_image {
- name: "microdroid_gki-android14-6.1_initrd_debug_hashdesc",
+ name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_debug_hashdesc",
defaults: ["microdroid_initrd_debug_defaults"],
- src: ":microdroid_gki-android14-6.1_initrd_debuggable",
+ src: ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable",
}
python_binary_host {
@@ -660,10 +660,10 @@
srcs: [":microdroid_kernel"],
arch: {
arm64: {
- srcs: [":microdroid_gki-android14-6.1_kernel_signed"],
+ srcs: [":microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed"],
},
x86_64: {
- srcs: [":microdroid_gki-android14-6.1_kernel_signed"],
+ srcs: [":microdroid_gki-android14-6.1-pkvm_experimental_kernel_signed"],
},
},
out: ["lib.rs"],
diff --git a/microdroid/initrd/Android.bp b/microdroid/initrd/Android.bp
index 544a3ff..7246f04 100644
--- a/microdroid/initrd/Android.bp
+++ b/microdroid/initrd/Android.bp
@@ -41,22 +41,22 @@
}
genrule {
- name: "microdroid_gki-android14-6.1_initrd_gen_arm64",
+ name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_gen_arm64",
srcs: [
":microdroid_ramdisk",
":microdroid_first_stage_ramdisk",
- ":microdroid_gki_modules-6.1-arm64",
+ ":microdroid_gki_modules-6.1-pkvm_experimental-arm64",
],
out: ["microdroid_initrd.img"],
cmd: "cat $(in) > $(out)",
}
genrule {
- name: "microdroid_gki-android14-6.1_initrd_gen_x86_64",
+ name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_gen_x86_64",
srcs: [
":microdroid_ramdisk",
":microdroid_first_stage_ramdisk",
- ":microdroid_gki_modules-6.1-x86_64",
+ ":microdroid_gki_modules-6.1-pkvm_experimental-x86_64",
],
out: ["microdroid_initrd.img"],
cmd: "cat $(in) > $(out)",
@@ -96,13 +96,13 @@
}
genrule {
- name: "microdroid_gki-android14-6.1_initrd_debuggable_arm64",
+ name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable_arm64",
tools: ["initrd_bootconfig"],
srcs: [
- ":microdroid_gki-android14-6.1_initrd_gen_arm64",
+ ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_gen_arm64",
":microdroid_bootconfig_debuggable_src",
] + bootconfigs_arm64,
- out: ["microdroid_gki-android14-6.1_initrd_debuggable_arm64"],
+ out: ["microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable_arm64"],
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
@@ -118,13 +118,13 @@
}
genrule {
- name: "microdroid_gki-android14-6.1_initrd_debuggable_x86_64",
+ name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable_x86_64",
tools: ["initrd_bootconfig"],
srcs: [
- ":microdroid_gki-android14-6.1_initrd_gen_x86_64",
+ ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_gen_x86_64",
":microdroid_bootconfig_debuggable_src",
] + bootconfigs_x86_64,
- out: ["microdroid_gki-android14-6.1_initrd_debuggable_x86_64"],
+ out: ["microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable_x86_64"],
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
@@ -140,13 +140,13 @@
}
genrule {
- name: "microdroid_gki-android14-6.1_initrd_normal_arm64",
+ name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_arm64",
tools: ["initrd_bootconfig"],
srcs: [
- ":microdroid_gki-android14-6.1_initrd_gen_arm64",
+ ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_gen_arm64",
":microdroid_bootconfig_normal_src",
] + bootconfigs_arm64,
- out: ["microdroid_gki-android14-6.1_initrd_normal_arm64"],
+ out: ["microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_arm64"],
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
@@ -162,13 +162,13 @@
}
genrule {
- name: "microdroid_gki-android14-6.1_initrd_normal_x86_64",
+ name: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_x86_64",
tools: ["initrd_bootconfig"],
srcs: [
- ":microdroid_gki-android14-6.1_initrd_gen_x86_64",
+ ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_gen_x86_64",
":microdroid_bootconfig_normal_src",
] + bootconfigs_x86_64,
- out: ["microdroid_gki-android14-6.1_initrd_normal_x86_64"],
+ out: ["microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_x86_64"],
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
@@ -188,18 +188,18 @@
}
prebuilt_etc {
- name: "microdroid_gki-android14-6.1_initrd_debuggable",
+ 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_initrd_debuggable_x86_64",
+ src: ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable_x86_64",
},
arm64: {
- src: ":microdroid_gki-android14-6.1_initrd_debuggable_arm64",
+ src: ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable_arm64",
},
},
- filename: "microdroid_gki-android14-6.1_initrd_debuggable.img",
+ filename: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_debuggable.img",
}
prebuilt_etc {
@@ -218,16 +218,16 @@
}
prebuilt_etc {
- name: "microdroid_gki-android14-6.1_initrd_normal",
+ 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_initrd_normal_x86_64",
+ src: ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_x86_64",
},
arm64: {
- src: ":microdroid_gki-android14-6.1_initrd_normal_arm64",
+ src: ":microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal_arm64",
},
},
- filename: "microdroid_gki-android14-6.1_initrd_normal.img",
+ filename: "microdroid_gki-android14-6.1-pkvm_experimental_initrd_normal.img",
}
diff --git a/microdroid/microdroid_gki-android14-6.1.json b/microdroid/microdroid_gki-android14-6.1-pkvm_experimental.json
similarity index 92%
rename from microdroid/microdroid_gki-android14-6.1.json
rename to microdroid/microdroid_gki-android14-6.1-pkvm_experimental.json
index 9392fae..4e58573 100644
--- a/microdroid/microdroid_gki-android14-6.1.json
+++ b/microdroid/microdroid_gki-android14-6.1-pkvm_experimental.json
@@ -1,5 +1,5 @@
{
- "kernel": "/apex/com.android.virt/etc/fs/microdroid_gki-android14-6.1_kernel",
+ "kernel": "/apex/com.android.virt/etc/fs/microdroid_gki-android14-6.1-pkvm_experimental_kernel",
"disks": [
{
"partitions": [
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 f881909..364e769 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
@@ -67,7 +67,8 @@
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")));
+ Collections.unmodifiableSet(
+ new HashSet(Arrays.asList("android14-6.1-pkvm_experimental")));
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 1e81172..203bcae 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
@@ -69,7 +69,8 @@
/ MICRODROID_COMMAND_RETRY_INTERVAL_MILLIS);
protected static final Set<String> SUPPORTED_GKI_VERSIONS =
- Collections.unmodifiableSet(new HashSet(Arrays.asList("android14-6.1")));
+ Collections.unmodifiableSet(
+ new HashSet(Arrays.asList("android14-6.1-pkvm_experimental")));
/* Keep this sync with AssignableDevice.aidl */
public static final class AssignableDevice {