diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index 5bbad1290..811e6faee 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -46,7 +46,7 @@ jobs:
         java -version
         gci env:* | sort-object name
         new-item "C:\Users\runneradmin\.android\repositories.cfg" -ItemType "file"
-        echo yes | .\sdkmanager.bat "ndk-bundle" "cmake;3.10.2.4988404" "ndk;21.4.7075529" --sdk_root=$Env:ANDROID_SDK_ROOT
+        echo yes | .\sdkmanager.bat "ndk-bundle" "cmake;3.10.2.4988404" "ndk;29.0.13599879" --sdk_root=$Env:ANDROID_SDK_ROOT
       working-directory: ${{ env.ANDROID_SDK_ROOT }}\cmdline-tools\7.0\bin
     - name: Chocolatey
       run: |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3861e74f7..5dc91e80c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -116,7 +116,7 @@ jobs:
         java -version
         gci env:* | sort-object name
         new-item "C:\Users\runneradmin\.android\repositories.cfg" -ItemType "file"
-        echo yes | .\sdkmanager.bat "ndk-bundle" "cmake;3.10.2.4988404" "ndk;21.4.7075529" --sdk_root=$Env:ANDROID_SDK_ROOT
+        echo yes | .\sdkmanager.bat "ndk-bundle" "cmake;3.10.2.4988404" "ndk;29.0.13599879" --sdk_root=$Env:ANDROID_SDK_ROOT
       working-directory: ${{ env.ANDROID_SDK_ROOT }}\cmdline-tools\7.0\bin
     - name: Chocolatey
       run: |
diff --git a/build-android.cmd b/build-android.cmd
index 662446035..b5da5a047 100644
--- a/build-android.cmd
+++ b/build-android.cmd
@@ -4,7 +4,7 @@ pushd "%~dp0"
 REM Users may override the default %ANDROID_SDK_ROOT% location if necessary
 
 if "%ANDROID_SDK_ROOT%"      == "" set "ANDROID_SDK_ROOT=C:\Android\android-sdk"
-if "%ANDROID_NDK_VERSION%"   == "" set "ANDROID_NDK_VERSION=21.4.7075529"
+if "%ANDROID_NDK_VERSION%"   == "" set "ANDROID_NDK_VERSION=29.0.13599879"
 if "%ANDROID_CMAKE_VERSION%" == "" set "ANDROID_CMAKE_VERSION=3.10.2.4988404"
 if "%ANDROID_HOME%"          == "" set "ANDROID_HOME=%ANDROID_SDK_ROOT%"
 if "%ANDROID_NDK%"           == "" set "ANDROID_NDK=%ANDROID_SDK_ROOT%\ndk\%ANDROID_NDK_VERSION%"
diff --git a/docs/cpp-start-android.md b/docs/cpp-start-android.md
index 4adb0c174..a5c191a09 100644
--- a/docs/cpp-start-android.md
+++ b/docs/cpp-start-android.md
@@ -22,7 +22,7 @@ Default environment variables used by `build-android.cmd` script:
 
 ```console
 
-set "ANDROID_NDK_VERSION=21.4.7075529"
+set "ANDROID_NDK_VERSION=29.0.13599879"
 set "ANDROID_CMAKE_VERSION=3.10.2.4988404"
 set "ANDROID_SDK_ROOT=C:\Android\android-sdk"
 set "ANDROID_HOME=%ANDROID_SDK_ROOT%"
diff --git a/lib/android_build/app/src/main/AndroidManifest.xml b/lib/android_build/app/src/main/AndroidManifest.xml
index 0d7c8ba50..a9cb4578b 100644
--- a/lib/android_build/app/src/main/AndroidManifest.xml
+++ b/lib/android_build/app/src/main/AndroidManifest.xml
@@ -12,7 +12,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:networkSecurityConfig="@xml/network_security_config">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/lib/android_build/ide.cmd b/lib/android_build/ide.cmd
index a95c8776c..a50554613 100644
--- a/lib/android_build/ide.cmd
+++ b/lib/android_build/ide.cmd
@@ -9,7 +9,7 @@ set "PATH=%AndroidStudioPath%\bin;%PATH%"
 
 if "%ANDROID_SDK_ROOT%"   == "" set "ANDROID_SDK_ROOT=C:\Android\android-sdk"
 if "%ANDROID_HOME%"       == "" set "ANDROID_HOME=%ANDROID_SDK_ROOT%"
-if "%ANDROID_NDK_VERSION%"== "" set "ANDROID_NDK_VERSION=21.4.7075529"
+if "%ANDROID_NDK_VERSION%"== "" set "ANDROID_NDK_VERSION=29.0.13599879"
 if "%ANDROID_NDK%"        == "" set "ANDROID_NDK=%ANDROID_SDK_ROOT%\ndk\%ANDROID_NDK_VERSION%"
 if "%ANDROID_NDK_HOME%"   == "" set "ANDROID_NDK_HOME=%ANDROID_NDK%"
 
diff --git a/lib/android_build/maesdk/build.gradle b/lib/android_build/maesdk/build.gradle
index b87a927fb..6dda47eb8 100644
--- a/lib/android_build/maesdk/build.gradle
+++ b/lib/android_build/maesdk/build.gradle
@@ -20,6 +20,7 @@ android {
                     args.add("-DANDROID_STL=c++_shared")
                     args.add("-DBUILD_SHARED_LIBS=1")
                     args.add("-DUSE_ROOM=1")
+                    args.add("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
                     String linkerFlag = project.findProperty("CMAKE_SHARED_LINKER_FLAGS") ?: ""
                     linkerFlag = "-DCMAKE_SHARED_LINKER_FLAGS=" + linkerFlag
                     args.add(linkerFlag)
diff --git a/lib/android_build/tools.gradle b/lib/android_build/tools.gradle
index 8ccf2626a..279643c9c 100644
--- a/lib/android_build/tools.gradle
+++ b/lib/android_build/tools.gradle
@@ -2,11 +2,11 @@ android {
 
     compileSdkVersion    = 32
 
-    ndkVersion           = System.getenv("ANDROID_NDK_VERSION") ?: "21.4.7075529"
+    ndkVersion           =  System.getenv("ANDROID_NDK_VERSION") ?: "29.0.13599879"
 
     defaultConfig {
-        minSdkVersion    = 19
-        targetSdkVersion = 29
+        minSdkVersion    19
+        targetSdkVersion 31
     }
 }