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 = {