diff --git a/shim/Android.bp b/shim/Android.bp
index b9952664907103b1b73b3310fe36db5b9ba14f57..82494528d6a437f9dfd2230904d9c3b27f3417c2 100644
--- a/shim/Android.bp
+++ b/shim/Android.bp
@@ -29,6 +29,10 @@ prebuilt_apex {
     arm64: {
       src: "prebuilts/arm/com.android.apex.cts.shim.v1.apex",
     },
+    // FIXME: need to create real file for riscv64, now just use arm64 to pass build
+    riscv64: {
+      src: "prebuilts/riscv/com.android.apex.cts.shim.v1.apex",
+    },
     x86: {
       src: "prebuilts/x86/com.android.apex.cts.shim.v1.apex",
     },
@@ -50,6 +54,10 @@ prebuilt_apex {
     arm64: {
       src: "prebuilts/arm/com.android.apex.cts.shim.v2.apex",
     },
+    // FIXME: need to create real file for riscv64, now just use arm64 to pass build
+    riscv64: {
+      src: "prebuilts/riscv/com.android.apex.cts.shim.v2.apex",
+    },
     x86: {
       src: "prebuilts/x86/com.android.apex.cts.shim.v2.apex",
     },
@@ -70,6 +78,10 @@ prebuilt_apex {
     arm64: {
       src: "prebuilts/arm/com.android.apex.cts.shim.v2_wrong_sha.apex",
     },
+    // FIXME: need to create real file for riscv64, now just use arm64 to pass build
+    riscv64: {
+      src: "prebuilts/riscv/com.android.apex.cts.shim.v2_wrong_sha.apex",
+    },
     x86: {
       src: "prebuilts/x86/com.android.apex.cts.shim.v2_wrong_sha.apex",
     },
@@ -90,6 +102,10 @@ prebuilt_apex {
     arm64: {
       src: "prebuilts/arm/com.android.apex.cts.shim.v2_additional_file.apex",
     },
+    // FIXME: need to create real file for riscv64, now just use arm64 to pass build
+    riscv64: {
+      src: "prebuilts/riscv/com.android.apex.cts.shim.v2_additional_file.apex",
+    },
     x86: {
       src: "prebuilts/x86/com.android.apex.cts.shim.v2_additional_file.apex",
     },
@@ -110,6 +126,10 @@ prebuilt_apex {
     arm64: {
       src: "prebuilts/arm/com.android.apex.cts.shim.v2_additional_folder.apex",
     },
+    // FIXME: need to create real file for riscv64, now just use arm64 to pass build
+    riscv64: {
+      src: "prebuilts/riscv/com.android.apex.cts.shim.v2_additional_folder.apex",
+    },
     x86: {
       src: "prebuilts/x86/com.android.apex.cts.shim.v2_additional_folder.apex",
     },
@@ -130,6 +150,10 @@ prebuilt_apex {
     arm64: {
       src: "prebuilts/arm/com.android.apex.cts.shim.v2_with_pre_install_hook.apex",
     },
+    // FIXME: need to create real file for riscv64, now just use arm64 to pass build
+    riscv64: {
+      src: "prebuilts/riscv/com.android.apex.cts.shim.v2_with_pre_install_hook.apex",
+    },
     x86: {
       src: "prebuilts/x86/com.android.apex.cts.shim.v2_with_pre_install_hook.apex",
     },
@@ -150,6 +174,10 @@ prebuilt_apex {
     arm64: {
       src: "prebuilts/arm/com.android.apex.cts.shim.v2_with_post_install_hook.apex",
     },
+    // FIXME: need to create real file for riscv64, now just use arm64 to pass build
+    riscv64: {
+      src: "prebuilts/riscv/com.android.apex.cts.shim.v2_with_post_install_hook.apex",
+    },
     x86: {
       src: "prebuilts/x86/com.android.apex.cts.shim.v2_with_post_install_hook.apex",
     },
@@ -170,6 +198,10 @@ prebuilt_apex {
     arm64: {
       src: "prebuilts/arm/com.android.apex.cts.shim.v3.apex",
     },
+    // FIXME: need to create real file for riscv64, now just use arm64 to pass build
+    riscv64: {
+      src: "prebuilts/riscv/com.android.apex.cts.shim.v3.apex",
+    },
     x86: {
       src: "prebuilts/x86/com.android.apex.cts.shim.v3.apex",
     },
@@ -190,6 +222,10 @@ prebuilt_apex {
     arm64: {
       src: "prebuilts/arm/com.android.apex.cts.shim.v2_different_certificate.apex",
     },
+    // FIXME: need to create real file for riscv64, now just use arm64 to pass build
+    riscv64: {
+      src: "prebuilts/riscv/com.android.apex.cts.shim.v2_different_certificate.apex",
+    },
     x86: {
       src: "prebuilts/x86/com.android.apex.cts.shim.v2_different_certificate.apex",
     },
@@ -210,6 +246,10 @@ prebuilt_apex {
     arm64: {
       src: "prebuilts/arm/com.android.apex.cts.shim.v2_unsigned_apk_container.apex",
     },
+    // FIXME: need to create real file for riscv64, now just use arm64 to pass build
+    riscv64: {
+      src: "prebuilts/riscv/com.android.apex.cts.shim.v2_unsigned_apk_container.apex",
+    },
     x86: {
       src: "prebuilts/x86/com.android.apex.cts.shim.v2_unsigned_apk_container.apex",
     },
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v1.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v1.apex
new file mode 100644
index 0000000000000000000000000000000000000000..791d0dd950eddb63c211bfa9fea6ac989483ae24
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v1.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2.apex
new file mode 100644
index 0000000000000000000000000000000000000000..0a26d23616253604d5d259332e510f3a6175bf6a
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_additional_file.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_additional_file.apex
new file mode 100644
index 0000000000000000000000000000000000000000..5ed2c7e0b9ead5a9d7322afcef7765365813ab13
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_additional_file.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_additional_folder.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_additional_folder.apex
new file mode 100644
index 0000000000000000000000000000000000000000..133f7f72a9c2be9085a1420ad191ccf567392b61
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_additional_folder.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex
new file mode 100644
index 0000000000000000000000000000000000000000..6ce5397588b41dedc8dc613dab1feb767a1c4bfc
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_apk_in_apex_sdk_target_p.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_different_certificate.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_different_certificate.apex
new file mode 100644
index 0000000000000000000000000000000000000000..4228ffedc8c19b8e3de9f454e1765aaa58259aac
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_different_certificate.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_different_package_name.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_different_package_name.apex
new file mode 100644
index 0000000000000000000000000000000000000000..de090f19022984f49993df6ed08175266343e528
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_different_package_name.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_no_hashtree.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_no_hashtree.apex
new file mode 100644
index 0000000000000000000000000000000000000000..162044cfba129d98f98a6162119c119a6b93903c
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_no_hashtree.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_rebootless.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_rebootless.apex
new file mode 100644
index 0000000000000000000000000000000000000000..9d6888769d1ba9a3aabbd7e30d9007606d664d3a
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_rebootless.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_sdk_target_p.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_sdk_target_p.apex
new file mode 100644
index 0000000000000000000000000000000000000000..44f7613c639bb40544413dd542148d5470bfccda
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_sdk_target_p.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex
new file mode 100644
index 0000000000000000000000000000000000000000..389871de5539e909c804d1b23638a7a33a2efdb0
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_sign_payload_with_different_key.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_signed_bob.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_signed_bob.apex
new file mode 100644
index 0000000000000000000000000000000000000000..f8fa44fbde72ab0dcd693140790df24d1299e7ae
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_signed_bob.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_signed_bob_rot.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_signed_bob_rot.apex
new file mode 100644
index 0000000000000000000000000000000000000000..96588183e346f88ed9bc2d13eb5dd7052ec800d8
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_signed_bob_rot.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex
new file mode 100644
index 0000000000000000000000000000000000000000..344004344bfe902c0d4502b5d19cd0b9ebaa097a
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_signed_bob_rot_rollback.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_unsigned_apk_container.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_unsigned_apk_container.apex
new file mode 100644
index 0000000000000000000000000000000000000000..b8444ba826f3b9e5054d7d2dd8ec8a1f1fa1ce41
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_unsigned_apk_container.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_unsigned_payload.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_unsigned_payload.apex
new file mode 100644
index 0000000000000000000000000000000000000000..d6f7d8ff162d1efce351c692db65d375f60cf77a
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_unsigned_payload.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_with_post_install_hook.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_with_post_install_hook.apex
new file mode 100644
index 0000000000000000000000000000000000000000..cc214f8c54c7cad825f03b062ea8ac87464c6019
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_with_post_install_hook.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_with_pre_install_hook.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_with_pre_install_hook.apex
new file mode 100644
index 0000000000000000000000000000000000000000..dab82a02ce41f4fd2cc99869d9d1414d5a3c60d9
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_with_pre_install_hook.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_without_apk_in_apex.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_without_apk_in_apex.apex
new file mode 100644
index 0000000000000000000000000000000000000000..9706f2f2e816255431129d3e343833709783557d
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_without_apk_in_apex.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_wrong_sha.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_wrong_sha.apex
new file mode 100644
index 0000000000000000000000000000000000000000..f305cff9ddecc1c5ea0761bfed817c0722cb81e6
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v2_wrong_sha.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v3.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v3.apex
new file mode 100644
index 0000000000000000000000000000000000000000..3122c967111ca32fbc8d8d8281d86c655758030e
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v3.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v3_rebootless.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v3_rebootless.apex
new file mode 100644
index 0000000000000000000000000000000000000000..0f5134da85ecbd989ba750f45ad0e628ffe7137d
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v3_rebootless.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v3_signed_bob.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v3_signed_bob.apex
new file mode 100644
index 0000000000000000000000000000000000000000..a83bf51f7670724995e41ec805a6c17cc6927748
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v3_signed_bob.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim.v3_signed_bob_rot.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim.v3_signed_bob_rot.apex
new file mode 100644
index 0000000000000000000000000000000000000000..703b6411353e72366433f71236294556e6953bc5
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim.v3_signed_bob_rot.apex differ
diff --git a/shim/prebuilts/riscv/com.android.apex.cts.shim_not_pre_installed.apex b/shim/prebuilts/riscv/com.android.apex.cts.shim_not_pre_installed.apex
new file mode 100644
index 0000000000000000000000000000000000000000..806ccc77ebb5f7d4f4eb0245345aa725fb6e249b
Binary files /dev/null and b/shim/prebuilts/riscv/com.android.apex.cts.shim_not_pre_installed.apex differ
diff --git a/tests/testdata/sharedlibs/prebuilts/Android.bp b/tests/testdata/sharedlibs/prebuilts/Android.bp
index 1ef2977eb08f9db4e726c6025da7f879b38b1658..4b81d9785f5959be322335dc1c7013487d36a226 100644
--- a/tests/testdata/sharedlibs/prebuilts/Android.bp
+++ b/tests/testdata/sharedlibs/prebuilts/Android.bp
@@ -20,6 +20,8 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+// FIXME: need to create real files for riscv64, now just use arm64 to pass build
+
 prebuilt_apex {
   name: "com.android.apex.test.bar_stripped.v1.libvX_prebuilt",
   arch: {
@@ -29,6 +31,9 @@ prebuilt_apex {
     arm64: {
       src: "arm64/com.android.apex.test.bar_stripped.v1.libvX.apex",
     },
+    riscv64: {
+      src: "riscv64/com.android.apex.test.bar_stripped.v1.libvX.apex",
+    },
     x86: {
       src: "x86/com.android.apex.test.bar_stripped.v1.libvX.apex",
     },
@@ -49,6 +54,9 @@ prebuilt_apex {
     arm64: {
       src: "arm64/com.android.apex.test.bar_stripped.v2.libvY.apex",
     },
+    riscv64: {
+      src: "riscv64/com.android.apex.test.bar_stripped.v2.libvY.apex",
+    },
     x86: {
       src: "x86/com.android.apex.test.bar_stripped.v2.libvY.apex",
     },
@@ -69,6 +77,9 @@ prebuilt_apex {
     arm64: {
       src: "arm64/com.android.apex.test.bar.v1.libvX.apex",
     },
+    riscv64: {
+      src: "riscv64/com.android.apex.test.bar.v1.libvX.apex",
+    },
     x86: {
       src: "x86/com.android.apex.test.bar.v1.libvX.apex",
     },
@@ -89,6 +100,9 @@ prebuilt_apex {
     arm64: {
       src: "arm64/com.android.apex.test.bar.v2.libvY.apex",
     },
+    riscv64: {
+      src: "riscv64/com.android.apex.test.bar.v2.libvY.apex",
+    },
     x86: {
       src: "x86/com.android.apex.test.bar.v2.libvY.apex",
     },
@@ -109,6 +123,9 @@ prebuilt_apex {
     arm64: {
       src: "arm64/com.android.apex.test.baz_stripped.v1.libvX.apex",
     },
+    riscv64: {
+      src: "riscv64/com.android.apex.test.baz_stripped.v1.libvX.apex",
+    },
     x86: {
       src: "x86/com.android.apex.test.baz_stripped.v1.libvX.apex",
     },
@@ -129,6 +146,9 @@ prebuilt_apex {
     arm64: {
       src: "arm64/com.android.apex.test.foo_stripped.v1.libvX.apex",
     },
+    riscv64: {
+      src: "riscv64/com.android.apex.test.foo_stripped.v1.libvX.apex",
+    },
     x86: {
       src: "x86/com.android.apex.test.foo_stripped.v1.libvX.apex",
     },
@@ -149,6 +169,9 @@ prebuilt_apex {
     arm64: {
       src: "arm64/com.android.apex.test.foo_stripped.v2.libvY.apex",
     },
+    riscv64: {
+      src: "riscv64/com.android.apex.test.foo_stripped.v2.libvY.apex",
+    },
     x86: {
       src: "x86/com.android.apex.test.foo_stripped.v2.libvY.apex",
     },
@@ -169,6 +192,9 @@ prebuilt_apex {
     arm64: {
       src: "arm64/com.android.apex.test.foo.v1.libvX.apex",
     },
+    riscv64: {
+      src: "riscv64/com.android.apex.test.foo.v1.libvX.apex",
+    },
     x86: {
       src: "x86/com.android.apex.test.foo.v1.libvX.apex",
     },
@@ -189,6 +215,9 @@ prebuilt_apex {
     arm64: {
       src: "arm64/com.android.apex.test.foo.v2.libvY.apex",
     },
+    riscv64: {
+      src: "riscv64/com.android.apex.test.foo.v2.libvY.apex",
+    },
     x86: {
       src: "x86/com.android.apex.test.foo.v2.libvY.apex",
     },
@@ -209,6 +238,9 @@ prebuilt_apex {
     arm64: {
       src: "arm64/com.android.apex.test.pony_stripped.v1.libvZ.apex",
     },
+    riscv64: {
+      src: "riscv64/com.android.apex.test.pony_stripped.v1.libvZ.apex",
+    },
     x86: {
       src: "x86/com.android.apex.test.pony_stripped.v1.libvZ.apex",
     },
@@ -229,6 +261,9 @@ prebuilt_apex {
     arm64: {
       src: "arm64/com.android.apex.test.pony.v1.libvZ.apex",
     },
+    riscv64: {
+      src: "riscv64/com.android.apex.test.pony.v1.libvZ.apex",
+    },
     x86: {
       src: "x86/com.android.apex.test.pony.v1.libvZ.apex",
     },
@@ -249,6 +284,9 @@ prebuilt_apex {
     arm64: {
       src: "arm64/com.android.apex.test.sharedlibs_generated.v1.libvX.apex",
     },
+    riscv64: {
+      src: "riscv64/com.android.apex.test.sharedlibs_generated.v1.libvX.apex",
+    },
     x86: {
       src: "x86/com.android.apex.test.sharedlibs_generated.v1.libvX.apex",
     },
@@ -269,6 +307,9 @@ prebuilt_apex {
     arm64: {
       src: "arm64/com.android.apex.test.sharedlibs_generated.v2.libvY.apex",
     },
+    riscv64: {
+      src: "riscv64/com.android.apex.test.sharedlibs_generated.v2.libvY.apex",
+    },
     x86: {
       src: "x86/com.android.apex.test.sharedlibs_generated.v2.libvY.apex",
     },
@@ -289,6 +330,9 @@ prebuilt_apex {
     arm64: {
       src: "arm64/com.android.apex.test.sharedlibs_secondary_generated.v1.libvZ.apex",
     },
+    riscv64: {
+      src: "riscv64/com.android.apex.test.sharedlibs_secondary_generated.v1.libvZ.apex",
+    },
     x86: {
       src: "x86/com.android.apex.test.sharedlibs_secondary_generated.v1.libvZ.apex",
     },
diff --git a/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.bar.v1.libvX.apex b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.bar.v1.libvX.apex
new file mode 100644
index 0000000000000000000000000000000000000000..c04a16914f38b3ba21748046a2c9ade06d51226d
Binary files /dev/null and b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.bar.v1.libvX.apex differ
diff --git a/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.bar.v2.libvY.apex b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.bar.v2.libvY.apex
new file mode 100644
index 0000000000000000000000000000000000000000..9bedfa2550fb51a28e81cead108b0ae1d7af182d
Binary files /dev/null and b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.bar.v2.libvY.apex differ
diff --git a/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.bar_stripped.v1.libvX.apex b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.bar_stripped.v1.libvX.apex
new file mode 100644
index 0000000000000000000000000000000000000000..a8459790d4d6efb744e13f679a1ef09896a55f20
Binary files /dev/null and b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.bar_stripped.v1.libvX.apex differ
diff --git a/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.bar_stripped.v2.libvY.apex b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.bar_stripped.v2.libvY.apex
new file mode 100644
index 0000000000000000000000000000000000000000..c8f89611093afcf0c32b868e3dbe46bfc919f1b0
Binary files /dev/null and b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.bar_stripped.v2.libvY.apex differ
diff --git a/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.baz_stripped.v1.libvX.apex b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.baz_stripped.v1.libvX.apex
new file mode 100644
index 0000000000000000000000000000000000000000..e2e5b7085de34997cb34cea81cd874fb45084c23
Binary files /dev/null and b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.baz_stripped.v1.libvX.apex differ
diff --git a/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.foo.v1.libvX.apex b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.foo.v1.libvX.apex
new file mode 100644
index 0000000000000000000000000000000000000000..d6795a59f808c5851a339803fa159c09cb762a03
Binary files /dev/null and b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.foo.v1.libvX.apex differ
diff --git a/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.foo.v2.libvY.apex b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.foo.v2.libvY.apex
new file mode 100644
index 0000000000000000000000000000000000000000..65dcd649d6071b16d8184c9ff5f475fb34042cec
Binary files /dev/null and b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.foo.v2.libvY.apex differ
diff --git a/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.foo_stripped.v1.libvX.apex b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.foo_stripped.v1.libvX.apex
new file mode 100644
index 0000000000000000000000000000000000000000..894afa2267aa79356ce96155cb9df02af1a811d3
Binary files /dev/null and b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.foo_stripped.v1.libvX.apex differ
diff --git a/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.foo_stripped.v2.libvY.apex b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.foo_stripped.v2.libvY.apex
new file mode 100644
index 0000000000000000000000000000000000000000..c1ce6fad08331b18cc54491b64ae663647b3034d
Binary files /dev/null and b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.foo_stripped.v2.libvY.apex differ
diff --git a/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.pony.v1.libvZ.apex b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.pony.v1.libvZ.apex
new file mode 100644
index 0000000000000000000000000000000000000000..80c64239d969ffa0b5fa4cece1d43307e0c8668e
Binary files /dev/null and b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.pony.v1.libvZ.apex differ
diff --git a/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.pony_stripped.v1.libvZ.apex b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.pony_stripped.v1.libvZ.apex
new file mode 100644
index 0000000000000000000000000000000000000000..4d380da7ef542a06cd7803c549bb181c6cc6d015
Binary files /dev/null and b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.pony_stripped.v1.libvZ.apex differ
diff --git a/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.sharedlibs_generated.v1.libvX.apex b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.sharedlibs_generated.v1.libvX.apex
new file mode 100644
index 0000000000000000000000000000000000000000..e0cf9e7c308919a2bf02ab48ffaaf9f056513e9a
Binary files /dev/null and b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.sharedlibs_generated.v1.libvX.apex differ
diff --git a/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.sharedlibs_generated.v2.libvY.apex b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.sharedlibs_generated.v2.libvY.apex
new file mode 100644
index 0000000000000000000000000000000000000000..93f24f25f5a135a1ee744645885ab1a9ef033ea5
Binary files /dev/null and b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.sharedlibs_generated.v2.libvY.apex differ
diff --git a/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.sharedlibs_secondary_generated.v1.libvZ.apex b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.sharedlibs_secondary_generated.v1.libvZ.apex
new file mode 100644
index 0000000000000000000000000000000000000000..21a6dc3c85e3253b96fb5d79202015434c6d2e9a
Binary files /dev/null and b/tests/testdata/sharedlibs/prebuilts/riscv64/com.android.apex.test.sharedlibs_secondary_generated.v1.libvZ.apex differ