Merge "Set rollback_index of microdroid_kernel to 1" into main
diff --git a/apex/sign_virt_apex.py b/apex/sign_virt_apex.py
index a42f5ec..8257aae 100644
--- a/apex/sign_virt_apex.py
+++ b/apex/sign_virt_apex.py
@@ -231,6 +231,9 @@
if additional_descriptors:
for image in additional_descriptors:
cmd.extend(['--include_descriptors_from_image', image])
+
+ if 'Rollback Index' in info:
+ cmd.extend(['--rollback_index', info['Rollback Index']])
RunCommand(args, cmd)
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 00831dd..bac93a4 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -409,7 +409,19 @@
},
}
-avb_add_hash_footer {
+soong_config_module_type {
+ name: "flag_aware_avb_add_hash_footer",
+ module_type: "avb_add_hash_footer",
+ config_namespace: "ANDROID",
+ bool_variables: [
+ "release_avf_enable_llpvm_changes",
+ ],
+ properties: [
+ "rollback_index",
+ ],
+}
+
+flag_aware_avb_add_hash_footer {
name: "microdroid_kernel_signed",
src: ":empty_file",
filename: "microdroid_kernel",
@@ -431,6 +443,12 @@
":microdroid_initrd_normal_hashdesc",
":microdroid_initrd_debug_hashdesc",
],
+ // Below are properties that are conditionally set depending on value of build flags.
+ soong_config_variables: {
+ release_avf_enable_llpvm_changes: {
+ rollback_index: 1,
+ },
+ },
}
prebuilt_etc {
@@ -447,7 +465,7 @@
},
}
-avb_add_hash_footer {
+flag_aware_avb_add_hash_footer {
name: "microdroid_kernel_with_modules_signed",
src: ":empty_file",
filename: "microdroid_kernel_with_modules",
@@ -465,6 +483,12 @@
":microdroid_initrd_normal_hashdesc",
":microdroid_initrd_debug_hashdesc",
],
+ // Below are properties that are conditionally set depending on value of build flags.
+ soong_config_variables: {
+ release_avf_enable_llpvm_changes: {
+ rollback_index: 1,
+ },
+ },
}
prebuilt_etc {