diff --git a/Android.bp b/Android.bp
index 2fffd32..eb06e78 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,9 +56,9 @@
         "libspin",
         "libuntrusted",
     ],
-    static_libs: [
-        "libring_core_0_17_0_alpha_11_",
-        "libring_core_0_17_0_alpha_11_test",
+    whole_static_libs: [
+        "libring-core",
+        "libring-test",
     ],
     apex_available: [
         "//apex_available:platform",
@@ -94,9 +94,9 @@
         "libspin",
         "libuntrusted",
     ],
-    static_libs: [
-        "libring_core_0_17_0_alpha_11_",
-        "libring_core_0_17_0_alpha_11_test",
+    whole_static_libs: [
+        "libring-core",
+        "libring-test",
     ],
 }
 
@@ -278,9 +278,10 @@
         "crypto/poly1305/poly1305_vec.c",
         "crypto/curve25519/curve25519.c",
         "crypto/fipsmodule/ec/ecp_nistz.c",
-        "crypto/fipsmodule/ec/ecp_nistz256.c",
         "crypto/fipsmodule/ec/gfp_p256.c",
         "crypto/fipsmodule/ec/gfp_p384.c",
+        "crypto/fipsmodule/ec/p256.c",
+        "crypto/fipsmodule/rsa/padding.c",
         "crypto/limbs/limbs.c",
         "crypto/mem.c",
         "crypto/fipsmodule/bn/montgomery.c",
@@ -296,7 +297,6 @@
                 "crypto/curve25519/asm/x25519-asm-arm.S",
                 "pregenerated/sha256-armv4-linux32.S",
                 "pregenerated/sha512-armv4-linux32.S",
-                "pregenerated/ecp_nistz256-armv4-linux32.S",
                 "pregenerated/aesv8-armx-linux32.S",
                 "pregenerated/bsaes-armv7-linux32.S",
                 "pregenerated/ghashv8-armx-linux32.S",
@@ -310,7 +310,6 @@
                 "pregenerated/aesv8-armx-linux64.S",
                 "pregenerated/armv8-mont-linux64.S",
                 "pregenerated/chacha-armv8-linux64.S",
-                "pregenerated/ecp_nistz256-armv8-linux64.S",
                 "pregenerated/ghash-neon-armv8-linux64.S",
                 "pregenerated/ghashv8-armx-linux64.S",
                 "pregenerated/sha256-armv8-linux64.S",
@@ -322,7 +321,6 @@
             srcs: [
                 "pregenerated/aesni-x86-elf.S",
                 "pregenerated/chacha-x86-elf.S",
-                "pregenerated/ecp_nistz256-x86-elf.S",
                 "pregenerated/ghash-x86-elf.S",
                 "pregenerated/vpaes-x86-elf.S",
                 "pregenerated/x86-mont-elf.S",
@@ -330,6 +328,7 @@
         },
         x86_64: {
             srcs: [
+                "crypto/fipsmodule/ec/p256-x86_64.c",
                 "pregenerated/aesni-gcm-x86_64-elf.S",
                 "pregenerated/aesni-x86_64-elf.S",
                 "pregenerated/chacha-x86_64-elf.S",
@@ -343,6 +342,9 @@
                 "pregenerated/x86_64-mont-elf.S",
             ],
         },
+        riscv64: {
+            cflags: ["-DOPENSSL_NO_ASM"],
+        },
     },
 
     cflags: [
diff --git a/cargo2android.json b/cargo2android.json
index 7dc276f..ae417f7 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -8,6 +8,7 @@
   "device": true,
   "features": "alloc,default,dev_urandom_fallback,once_cell,std",
   "min-sdk-version": "29",
+  "patch": "patches/Android.bp.patch",
   "run": true,
   "tests": true,
   "whole-static-libs": [
diff --git a/cargo2android_cc.bp b/cargo2android_cc.bp
index 918cfbe..c1d5e67 100644
--- a/cargo2android_cc.bp
+++ b/cargo2android_cc.bp
@@ -9,9 +9,10 @@
         "crypto/poly1305/poly1305_vec.c",
         "crypto/curve25519/curve25519.c",
         "crypto/fipsmodule/ec/ecp_nistz.c",
-        "crypto/fipsmodule/ec/ecp_nistz256.c",
         "crypto/fipsmodule/ec/gfp_p256.c",
         "crypto/fipsmodule/ec/gfp_p384.c",
+        "crypto/fipsmodule/ec/p256.c",
+        "crypto/fipsmodule/rsa/padding.c",
         "crypto/limbs/limbs.c",
         "crypto/mem.c",
         "crypto/fipsmodule/bn/montgomery.c",
@@ -27,7 +28,6 @@
                 "crypto/curve25519/asm/x25519-asm-arm.S",
                 "pregenerated/sha256-armv4-linux32.S",
                 "pregenerated/sha512-armv4-linux32.S",
-                "pregenerated/ecp_nistz256-armv4-linux32.S",
                 "pregenerated/aesv8-armx-linux32.S",
                 "pregenerated/bsaes-armv7-linux32.S",
                 "pregenerated/ghashv8-armx-linux32.S",
@@ -41,7 +41,6 @@
                 "pregenerated/aesv8-armx-linux64.S",
                 "pregenerated/armv8-mont-linux64.S",
                 "pregenerated/chacha-armv8-linux64.S",
-                "pregenerated/ecp_nistz256-armv8-linux64.S",
                 "pregenerated/ghash-neon-armv8-linux64.S",
                 "pregenerated/ghashv8-armx-linux64.S",
                 "pregenerated/sha256-armv8-linux64.S",
@@ -53,7 +52,6 @@
             srcs: [
                 "pregenerated/aesni-x86-elf.S",
                 "pregenerated/chacha-x86-elf.S",
-                "pregenerated/ecp_nistz256-x86-elf.S",
                 "pregenerated/ghash-x86-elf.S",
                 "pregenerated/vpaes-x86-elf.S",
                 "pregenerated/x86-mont-elf.S",
@@ -61,6 +59,7 @@
         },
         x86_64: {
             srcs: [
+                "crypto/fipsmodule/ec/p256-x86_64.c",
                 "pregenerated/aesni-gcm-x86_64-elf.S",
                 "pregenerated/aesni-x86_64-elf.S",
                 "pregenerated/chacha-x86_64-elf.S",
@@ -74,6 +73,9 @@
                 "pregenerated/x86_64-mont-elf.S",
             ],
         },
+        riscv64: {
+            cflags: ["-DOPENSSL_NO_ASM"],
+        },
     },
 
     cflags: [
@@ -108,4 +110,4 @@
         "com.android.resolv",
     ],
     min_sdk_version: "29",
-}
\ No newline at end of file
+}
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
new file mode 100644
index 0000000..5bbfbe8
--- /dev/null
+++ b/patches/Android.bp.patch
@@ -0,0 +1,30 @@
+diff --git a/Android.bp b/Android.bp
+index 2fffd32fb..eb06e7878 100644
+--- a/Android.bp
++++ b/Android.bp
+@@ -56,9 +56,9 @@ rust_library {
+         "libspin",
+         "libuntrusted",
+     ],
+-    static_libs: [
+-        "libring_core_0_17_0_alpha_11_",
+-        "libring_core_0_17_0_alpha_11_test",
++    whole_static_libs: [
++        "libring-core",
++        "libring-test",
+     ],
+     apex_available: [
+         "//apex_available:platform",
+@@ -94,9 +94,9 @@ rust_test {
+         "libspin",
+         "libuntrusted",
+     ],
+-    static_libs: [
+-        "libring_core_0_17_0_alpha_11_",
+-        "libring_core_0_17_0_alpha_11_test",
++    whole_static_libs: [
++        "libring-core",
++        "libring-test",
+     ],
+ }
+