diff --git a/packages/CtsShim/Android.bp b/packages/CtsShim/Android.bp
index 31cd760791312040aa26efe27fcab6716796347b..3b0724b87facbdb915abea765530fbe545f422b9 100644
--- a/packages/CtsShim/Android.bp
+++ b/packages/CtsShim/Android.bp
@@ -44,6 +44,10 @@ android_app_import {
         arm64: {
             apk: "apk/arm/CtsShimPriv.apk",
         },
+        // FIXME: need to create real apk for riscv64, now just use arm64 to pass build
+        riscv64: {
+            apk: "apk/riscv64/CtsShimPriv.apk",
+        },
         x86: {
             apk: "apk/x86/CtsShimPriv.apk",
         },
@@ -82,6 +86,10 @@ android_app_import {
         arm64: {
             apk: "apk/arm/CtsShim.apk",
         },
+        // FIXME: need to create real apk for riscv64, now just use arm64 to pass build
+        riscv64: {
+            apk: "apk/riscv64/CtsShim.apk",
+        },
         x86: {
             apk: "apk/x86/CtsShim.apk",
         },
diff --git a/packages/CtsShim/apk/riscv64/CtsShim.apk b/packages/CtsShim/apk/riscv64/CtsShim.apk
new file mode 100644
index 0000000000000000000000000000000000000000..0c3c4bb24208b002a0e1fa539e2314e720fbbc19
Binary files /dev/null and b/packages/CtsShim/apk/riscv64/CtsShim.apk differ
diff --git a/packages/CtsShim/apk/riscv64/CtsShimPriv.apk b/packages/CtsShim/apk/riscv64/CtsShimPriv.apk
new file mode 100644
index 0000000000000000000000000000000000000000..ee42d081f2f210f836a1b86592019faa54f4bdf9
Binary files /dev/null and b/packages/CtsShim/apk/riscv64/CtsShimPriv.apk differ