From 9d0b5298afd54b320767af7019645f03e96f362f Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Mon, 20 Apr 2026 01:36:36 -0700
Subject: [PATCH] Update to ONDK r30.0

---
 app/build-logic/src/main/java/Setup.kt | 2 +-
 native/src/external/crt0               | 2 +-
 native/src/external/system_properties  | 2 +-
 scripts/env.py                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build-logic/src/main/java/Setup.kt b/app/build-logic/src/main/java/Setup.kt
index dd0f76b35..251eb0c0c 100644
--- a/app/build-logic/src/main/java/Setup.kt
+++ b/app/build-logic/src/main/java/Setup.kt
@@ -47,7 +47,7 @@ fun Project.setupCommon() {
         }
         buildToolsVersion = "37.0.0"
         ndkPath = "${androidComponents.sdkComponents.sdkDirectory.get().asFile}/ndk/magisk"
-        ndkVersion = "29.0.14206865"
+        ndkVersion = "30.0.14904198"
 
         defaultConfig.apply {
             minSdk = 23
diff --git a/native/src/external/crt0 b/native/src/external/crt0
index 9dfa67b4d..49bbd472a 160000
--- a/native/src/external/crt0
+++ b/native/src/external/crt0
@@ -1 +1 @@
-Subproject commit 9dfa67b4d543f1b6bf2e936f560fbe77ca2a226a
+Subproject commit 49bbd472a250e75315a9183586fab1e0c0982618
diff --git a/native/src/external/system_properties b/native/src/external/system_properties
index b7c208856..80b217db0 160000
--- a/native/src/external/system_properties
+++ b/native/src/external/system_properties
@@ -1 +1 @@
-Subproject commit b7c2088565fbe13d22fe074960332e89615bb4aa
+Subproject commit 80b217db022ac7c46431b81b1f85bbe1aeddf49a
diff --git a/scripts/env.py b/scripts/env.py
index 7001b47bf..9e789eb66 100755
--- a/scripts/env.py
+++ b/scripts/env.py
@@ -10,7 +10,7 @@ from pathlib import Path
 from typing import NoReturn
 
 
-ondk_version = "r29.5"
+ondk_version = "r30.0"
 
 
 def color_print(code, str):