Move MicrodroidTestNativeLibWithLibIcu.so to separate test apk
This will make it easier to test the relaxed rollback protection scheme
feature (see follow up patches).
Bug: 378681279
Test: atest MicrodroidTests
Change-Id: Ifd86f08f8e7785534add80546bfdda53064b7b2f
diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 284d706..806592d 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -47,7 +47,6 @@
],
jni_libs: [
"MicrodroidTestNativeLib",
- "MicrodroidTestNativeLibWithLibIcu",
"MicrodroidIdleNativeLib",
"MicrodroidEmptyNativeLib",
"MicrodroidExitNativeLib",
@@ -64,11 +63,22 @@
DATA = [
":MicrodroidTestAppUpdated",
+ ":MicrodroidTestHelperAppRelaxedRollbackProtection_correct_V5",
":MicrodroidVmShareApp",
":test_microdroid_vendor_image",
":test_microdroid_vendor_image_unsigned",
]
+android_test_helper_app {
+ name: "MicrodroidTestHelperAppRelaxedRollbackProtection_correct_V5",
+ defaults: ["MicrodroidTestAppsDefaults"],
+ manifest: "AndroidManifestV5_relaxed_rollback_protection.xml",
+ jni_libs: [
+ "MicrodroidTestNativeLibWithLibIcu",
+ ],
+ min_sdk_version: "33",
+}
+
android_test {
name: "MicrodroidTestApp",
defaults: ["MicrodroidVersionsTestAppDefaults"],