diff --git a/android/wolfcryptjni-ndk-gradle/app/CMakeLists.txt b/android/wolfcryptjni-ndk-gradle/app/CMakeLists.txt
index 0eb0a514..4c42f722 100644
--- a/android/wolfcryptjni-ndk-gradle/app/CMakeLists.txt
+++ b/android/wolfcryptjni-ndk-gradle/app/CMakeLists.txt
@@ -4,14 +4,20 @@
 # Sets the minimum version of CMake required to build the native library.
 
 cmake_minimum_required(VERSION 3.4.1)
+project("wolfcryptjni-ndk-gradle")
 
-# Add preprocessor defines to CFLAGS
-add_definitions(-DNO_DSA -DNO_PSK -DNO_MD4 -DNO_HC128 -DNO_RABBIT
-                -DWOLFSSL_SHA512 -DWOLFSSL_SHA384 -DHAVE_AESGCM -DHAVE_HASHDRBG
-                -DHAVE_ECC -DWOLFSSL_KEY_GEN -DNO_PWDBASED -DUSE_FAST_MATH
-                -DTFM_ECC256 -DHAVE_DH -DUSE_FAST_MATH -DTFM_TIMING_RESISTANT
-                -DECC_TIMING_RESISTANT -DWC_RSA_BLINDING -DTFM_NO_ASM
-                )
+# Add preprocessor defines to CFLAGS. These mirror the CFLAGS set in
+# wolfssl/options.h if using './configure --enable-keygen'
+add_definitions(-DUSE_FAST_MATH -DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT
+                -DWC_RSA_BLINDING -DWOLFSSL_SHA224 -DWOLFSSL_SHA384
+                -DWOLFSSL_SHA512 -DHAVE_HKDF -DNO_DSA -DHAVE_ECC -DTFM_ECC256
+                -DECC_SHAMIR -DWC_RSA_PSS -DWOLFSSL_BASE64_ENCODE -DWOLFSSL_SHA3
+                -DHAVE_POLY1305 -DHAVE_CHACHA -DHAVE_HASHDRBG
+                -DHAVE_TLS_EXTENSIONS -DHAVE_SUPPORTED_CURVES -DHAVE_FFDHE_2048
+                -DWOLFSSL_TLS13 -DHAVE_EXTENDED_MASTER -DNO_RC4 -DNO_MD4
+                -DHAVE_ENCRYPT_THEN_MAC -DNO_PSK -DHAVE_DH_DEFAULT_PARAMS
+                -DWOLFSSL_KEY_GEN -DNO_DES3 -DGCM_TABLE_4BIT -DHAVE_AESGCM
+                -DTFM_NO_ASM)
 
 # set wolfSSL JNI location as environment variable, change if needed
 set(wolfcryptjni_DIR ${CMAKE_SOURCE_DIR}/../wolfcrypt-jni)
@@ -52,6 +58,7 @@ add_library(wolfssl SHARED
             ${wolfssl_DIR}/wolfcrypt/src/hash.c
             ${wolfssl_DIR}/wolfcrypt/src/hmac.c
             ${wolfssl_DIR}/wolfcrypt/src/integer.c
+            ${wolfssl_DIR}/wolfcrypt/src/kdf.c
             ${wolfssl_DIR}/wolfcrypt/src/logging.c
             ${wolfssl_DIR}/wolfcrypt/src/md2.c
             ${wolfssl_DIR}/wolfcrypt/src/md4.c
@@ -99,6 +106,7 @@ add_library(wolfcryptjni SHARED
             ${wolfcryptjni_DIR}/jni/jni_ecc.c
             ${wolfcryptjni_DIR}/jni/jni_ed25519.c
             ${wolfcryptjni_DIR}/jni/jni_error.c
+            ${wolfcryptjni_DIR}/jni/jni_feature_detect.c
             ${wolfcryptjni_DIR}/jni/jni_fips.c
             ${wolfcryptjni_DIR}/jni/jni_hmac.c
             ${wolfcryptjni_DIR}/jni/jni_logging.c
@@ -107,6 +115,7 @@ add_library(wolfcryptjni SHARED
             ${wolfcryptjni_DIR}/jni/jni_rng.c
             ${wolfcryptjni_DIR}/jni/jni_rsa.c
             ${wolfcryptjni_DIR}/jni/jni_sha.c
+            ${wolfcryptjni_DIR}/jni/jni_wolfobject.c
            )
 
 # Include libraries needed for wolfSSL and wolfCrypt JNI libs
diff --git a/android/wolfcryptjni-ndk-gradle/build.gradle b/android/wolfcryptjni-ndk-gradle/build.gradle
index 5ea98810..c4a62e79 100644
--- a/android/wolfcryptjni-ndk-gradle/build.gradle
+++ b/android/wolfcryptjni-ndk-gradle/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:7.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/android/wolfcryptjni-ndk-gradle/gradle/wrapper/gradle-wrapper.properties b/android/wolfcryptjni-ndk-gradle/gradle/wrapper/gradle-wrapper.properties
index 664a032f..0baaa8c9 100644
--- a/android/wolfcryptjni-ndk-gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/android/wolfcryptjni-ndk-gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 03 11:55:41 PDT 2019
+#Mon May 23 14:17:29 MDT 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/android/wolfcryptjni-ndk-gradle/wolfcrypt-jni b/android/wolfcryptjni-ndk-gradle/wolfcrypt-jni
index 38c4857d..81e1942e 160000
--- a/android/wolfcryptjni-ndk-gradle/wolfcrypt-jni
+++ b/android/wolfcryptjni-ndk-gradle/wolfcrypt-jni
@@ -1 +1 @@
-Subproject commit 38c4857d6e4c958f42be93d3568901eaa0c092f5
+Subproject commit 81e1942e00601da6860100e950cc34c80bbe4156
diff --git a/android/wolfcryptjni-ndk-gradle/wolfssl b/android/wolfcryptjni-ndk-gradle/wolfssl
index 21f2beca..e722c15b 160000
--- a/android/wolfcryptjni-ndk-gradle/wolfssl
+++ b/android/wolfcryptjni-ndk-gradle/wolfssl
@@ -1 +1 @@
-Subproject commit 21f2beca9f320199fcea4a96df3e19967804144b
+Subproject commit e722c15be860794179082a05d09e6a90dc77ccf0