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/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",
}