If rollback_index is specified use it in the dice chain of pVM
Ideally the subcomponents part of the payload node should have both
version and security_version, but this is not the case for now. Hence we
just override the security_version with the value of rollback_index.
Bug: 378681279
Test: atest MicrodroidTests
Change-Id: I3c4ecb0f7d725bd76347bdac1caa62b3c9106e06
diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 0ffab5d..6bfcad5 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -63,7 +63,9 @@
DATA = [
":MicrodroidTestAppUpdated",
- ":MicrodroidTestHelperAppRelaxedRollbackProtection_correct_V5",
+ ":MicrodroidTestHelperAppRelaxedRollbackProtection_V5",
+ ":MicrodroidTestHelperAppRelaxedRollbackProtection_V6",
+ ":MicrodroidTestHelperAppRelaxedRollbackProtection_V7_inc_rollback_version",
":MicrodroidTestHelperAppRelaxedRollbackProtection_no_permission",
":MicrodroidTestHelperAppRelaxedRollbackProtection_no_rollback_index",
":MicrodroidVmShareApp",
@@ -72,7 +74,7 @@
]
android_test_helper_app {
- name: "MicrodroidTestHelperAppRelaxedRollbackProtection_correct_V5",
+ name: "MicrodroidTestHelperAppRelaxedRollbackProtection_V5",
defaults: ["MicrodroidTestAppsDefaults"],
manifest: "AndroidManifestV5_relaxed_rollback_protection.xml",
jni_libs: [
@@ -83,6 +85,28 @@
}
android_test_helper_app {
+ name: "MicrodroidTestHelperAppRelaxedRollbackProtection_V6",
+ defaults: ["MicrodroidTestAppsDefaults"],
+ manifest: "AndroidManifestV6_relaxed_rollback_protection.xml",
+ jni_libs: [
+ "MicrodroidTestNativeLib",
+ "MicrodroidTestNativeLibWithLibIcu",
+ ],
+ min_sdk_version: "33",
+}
+
+android_test_helper_app {
+ name: "MicrodroidTestHelperAppRelaxedRollbackProtection_V7_inc_rollback_version",
+ defaults: ["MicrodroidTestAppsDefaults"],
+ manifest: "AndroidManifestV7_relaxed_rollback_protection_inc_rollback_version.xml",
+ jni_libs: [
+ "MicrodroidTestNativeLib",
+ "MicrodroidTestNativeLibWithLibIcu",
+ ],
+ min_sdk_version: "33",
+}
+
+android_test_helper_app {
name: "MicrodroidTestHelperAppRelaxedRollbackProtection_no_rollback_index",
defaults: ["MicrodroidTestAppsDefaults"],
manifest: "AndroidManifestV5_relaxed_rollback_protection_no_rollback_index.xml",