Add android version to gki version name
Both android version and kernel version are important to KMI, so adding
android version to gki version name too.
Bug: 302465542
Test: vm run-microdroid --gki android14-6.1
Test: atest MicrodroidHostTestCases
Change-Id: I3ee95c9d9c6576ee5869346c72cb0a3fb6cbdce2
diff --git a/apex/Android.bp b/apex/Android.bp
index acbc0a1..b09cf58 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -143,10 +143,10 @@
},
release_avf_enable_vendor_modules: {
prebuilts: [
- "microdroid_gki-6.1_initrd_debuggable",
- "microdroid_gki-6.1_initrd_normal",
- "microdroid_gki-6.1_kernel",
- "microdroid_gki-6.1.json",
+ "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",
],
},
release_avf_enable_remote_attestation: {
diff --git a/apex/sign_virt_apex.py b/apex/sign_virt_apex.py
index 0c5bc72..a975be0 100644
--- a/apex/sign_virt_apex.py
+++ b/apex/sign_virt_apex.py
@@ -411,7 +411,7 @@
RunCommand(args, cmd)
-gki_versions = ['6.1']
+gki_versions = ['android14-6.1']
# 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 c1caa56..f98f3af 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -557,17 +557,17 @@
}
///////////////////////////////////////
-// GKI-6.1 modules
+// GKI-android14-6.1 modules
///////////////////////////////////////
prebuilt_etc {
- name: "microdroid_gki-6.1.json",
- src: "microdroid_gki-6.1.json",
+ name: "microdroid_gki-android14-6.1.json",
+ src: "microdroid_gki-android14-6.1.json",
}
avb_add_hash_footer {
- name: "microdroid_gki-6.1_kernel_signed",
+ name: "microdroid_gki-android14-6.1_kernel_signed",
defaults: ["microdroid_kernel_signed_defaults"],
- filename: "microdroid_gki-6.1_kernel",
+ filename: "microdroid_gki-android14-6.1_kernel",
arch: {
arm64: {
src: ":microdroid_gki_kernel_prebuilts-6.1-arm64",
@@ -577,33 +577,33 @@
},
},
include_descriptors_from_images: [
- ":microdroid_gki-6.1_initrd_normal_hashdesc",
- ":microdroid_gki-6.1_initrd_debug_hashdesc",
+ ":microdroid_gki-android14-6.1_initrd_normal_hashdesc",
+ ":microdroid_gki-android14-6.1_initrd_debug_hashdesc",
],
}
prebuilt_etc {
- name: "microdroid_gki-6.1_kernel",
+ name: "microdroid_gki-android14-6.1_kernel",
src: ":empty_file",
relative_install_path: "fs",
arch: {
arm64: {
- src: ":microdroid_gki-6.1_kernel_signed",
+ src: ":microdroid_gki-android14-6.1_kernel_signed",
},
x86_64: {
- src: ":microdroid_gki-6.1_kernel_signed",
+ src: ":microdroid_gki-android14-6.1_kernel_signed",
},
},
}
avb_gen_vbmeta_image {
- name: "microdroid_gki-6.1_initrd_normal_hashdesc",
+ name: "microdroid_gki-android14-6.1_initrd_normal_hashdesc",
defaults: ["microdroid_initrd_normal_defaults"],
- src: ":microdroid_gki-6.1_initrd_normal",
+ src: ":microdroid_gki-android14-6.1_initrd_normal",
}
avb_gen_vbmeta_image {
- name: "microdroid_gki-6.1_initrd_debug_hashdesc",
+ name: "microdroid_gki-android14-6.1_initrd_debug_hashdesc",
defaults: ["microdroid_initrd_debug_defaults"],
- src: ":microdroid_gki-6.1_initrd_debuggable",
+ src: ":microdroid_gki-android14-6.1_initrd_debuggable",
}
diff --git a/microdroid/initrd/Android.bp b/microdroid/initrd/Android.bp
index 8df4c0f..ec971fa 100644
--- a/microdroid/initrd/Android.bp
+++ b/microdroid/initrd/Android.bp
@@ -41,7 +41,7 @@
}
genrule {
- name: "microdroid_gki-6.1_initrd_gen_arm64",
+ name: "microdroid_gki-android14-6.1_initrd_gen_arm64",
srcs: [
":microdroid_ramdisk",
":microdroid_fstab_ramdisk",
@@ -52,7 +52,7 @@
}
genrule {
- name: "microdroid_gki-6.1_initrd_gen_x86_64",
+ name: "microdroid_gki-android14-6.1_initrd_gen_x86_64",
srcs: [
":microdroid_ramdisk",
":microdroid_fstab_ramdisk",
@@ -96,13 +96,13 @@
}
genrule {
- name: "microdroid_gki-6.1_initrd_debuggable_arm64",
+ name: "microdroid_gki-android14-6.1_initrd_debuggable_arm64",
tools: ["initrd_bootconfig"],
srcs: [
- ":microdroid_gki-6.1_initrd_gen_arm64",
+ ":microdroid_gki-android14-6.1_initrd_gen_arm64",
":microdroid_bootconfig_debuggable_src",
] + bootconfigs_arm64,
- out: ["microdroid_gki-6.1_initrd_debuggable_arm64"],
+ out: ["microdroid_gki-android14-6.1_initrd_debuggable_arm64"],
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
@@ -118,13 +118,13 @@
}
genrule {
- name: "microdroid_gki-6.1_initrd_debuggable_x86_64",
+ name: "microdroid_gki-android14-6.1_initrd_debuggable_x86_64",
tools: ["initrd_bootconfig"],
srcs: [
- ":microdroid_gki-6.1_initrd_gen_x86_64",
+ ":microdroid_gki-android14-6.1_initrd_gen_x86_64",
":microdroid_bootconfig_debuggable_src",
] + bootconfigs_x86_64,
- out: ["microdroid_gki-6.1_initrd_debuggable_x86_64"],
+ out: ["microdroid_gki-android14-6.1_initrd_debuggable_x86_64"],
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
@@ -140,13 +140,13 @@
}
genrule {
- name: "microdroid_gki-6.1_initrd_normal_arm64",
+ name: "microdroid_gki-android14-6.1_initrd_normal_arm64",
tools: ["initrd_bootconfig"],
srcs: [
- ":microdroid_gki-6.1_initrd_gen_arm64",
+ ":microdroid_gki-android14-6.1_initrd_gen_arm64",
":microdroid_bootconfig_normal_src",
] + bootconfigs_arm64,
- out: ["microdroid_gki-6.1_initrd_normal_arm64"],
+ out: ["microdroid_gki-android14-6.1_initrd_normal_arm64"],
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
@@ -162,13 +162,13 @@
}
genrule {
- name: "microdroid_gki-6.1_initrd_normal_x86_64",
+ name: "microdroid_gki-android14-6.1_initrd_normal_x86_64",
tools: ["initrd_bootconfig"],
srcs: [
- ":microdroid_gki-6.1_initrd_gen_x86_64",
+ ":microdroid_gki-android14-6.1_initrd_gen_x86_64",
":microdroid_bootconfig_normal_src",
] + bootconfigs_x86_64,
- out: ["microdroid_gki-6.1_initrd_normal_x86_64"],
+ out: ["microdroid_gki-android14-6.1_initrd_normal_x86_64"],
cmd: "$(location initrd_bootconfig) attach --output $(out) $(in)",
}
@@ -188,18 +188,18 @@
}
prebuilt_etc {
- name: "microdroid_gki-6.1_initrd_debuggable",
+ name: "microdroid_gki-android14-6.1_initrd_debuggable",
// We don't have ramdisk for architectures other than x86_64 & arm64
src: ":empty_file",
arch: {
x86_64: {
- src: ":microdroid_gki-6.1_initrd_debuggable_x86_64",
+ src: ":microdroid_gki-android14-6.1_initrd_debuggable_x86_64",
},
arm64: {
- src: ":microdroid_gki-6.1_initrd_debuggable_arm64",
+ src: ":microdroid_gki-android14-6.1_initrd_debuggable_arm64",
},
},
- filename: "microdroid_gki-6.1_initrd_debuggable.img",
+ filename: "microdroid_gki-android14-6.1_initrd_debuggable.img",
}
prebuilt_etc {
@@ -218,16 +218,16 @@
}
prebuilt_etc {
- name: "microdroid_gki-6.1_initrd_normal",
+ name: "microdroid_gki-android14-6.1_initrd_normal",
// We don't have ramdisk for architectures other than x86_64 & arm64
src: ":empty_file",
arch: {
x86_64: {
- src: ":microdroid_gki-6.1_initrd_normal_x86_64",
+ src: ":microdroid_gki-android14-6.1_initrd_normal_x86_64",
},
arm64: {
- src: ":microdroid_gki-6.1_initrd_normal_arm64",
+ src: ":microdroid_gki-android14-6.1_initrd_normal_arm64",
},
},
- filename: "microdroid_gki-6.1_initrd_normal.img",
+ filename: "microdroid_gki-android14-6.1_initrd_normal.img",
}
diff --git a/microdroid/microdroid_gki-6.1.json b/microdroid/microdroid_gki-android14-6.1.json
similarity index 82%
rename from microdroid/microdroid_gki-6.1.json
rename to microdroid/microdroid_gki-android14-6.1.json
index 2115e51..9392fae 100644
--- a/microdroid/microdroid_gki-6.1.json
+++ b/microdroid/microdroid_gki-android14-6.1.json
@@ -1,5 +1,5 @@
{
- "kernel": "/apex/com.android.virt/etc/fs/microdroid_gki-6.1_kernel",
+ "kernel": "/apex/com.android.virt/etc/fs/microdroid_gki-android14-6.1_kernel",
"disks": [
{
"partitions": [
diff --git a/virtualizationmanager/src/aidl.rs b/virtualizationmanager/src/aidl.rs
index c63ed4c..7f98fe8 100644
--- a/virtualizationmanager/src/aidl.rs
+++ b/virtualizationmanager/src/aidl.rs
@@ -115,7 +115,7 @@
wait_for_interface(BINDER_SERVICE_IDENTIFIER)
.expect("Could not connect to VirtualizationServiceInternal");
static ref MICRODROID_GKI_OS_NAME_PATTERN: Regex =
- Regex::new(r"^microdroid_gki-\d+\.\d+$").expect("Failed to construct Regex");
+ Regex::new(r"^microdroid_gki-android\d+-\d+\.\d+$").expect("Failed to construct Regex");
}
fn create_or_update_idsig_file(