From d3e1c496ca62f4690100af392bc7ca860c858a29 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 15 Jun 2023 01:26:54 -0700
Subject: [PATCH] Upgrade ONDK to r25.6

---
 build.py              | 6 +++---
 gradle.properties     | 2 +-
 native/src/Cargo.toml | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.py b/build.py
index a89beae8f..b92bb9850 100755
--- a/build.py
+++ b/build.py
@@ -446,7 +446,7 @@ def find_jdk():
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL,
             env=env,
-            shell=True
+            shell=True,
         )
         no_jdk = proc.returncode != 0
     except FileNotFoundError:
@@ -529,12 +529,12 @@ def cleanup(args):
 
 def setup_ndk(args):
     ndk_ver = config["ondkVersion"]
-    url = f"https://github.com/topjohnwu/ondk/releases/download/{ndk_ver}/ondk-{ndk_ver}-{os_name}.tar.gz"
+    url = f"https://github.com/topjohnwu/ondk/releases/download/{ndk_ver}/ondk-{ndk_ver}-{os_name}.tar.xz"
     ndk_archive = url.split("/")[-1]
 
     header(f"* Downloading and extracting {ndk_archive}")
     with urllib.request.urlopen(url) as response:
-        with tarfile.open(mode="r|gz", fileobj=response) as tar:
+        with tarfile.open(mode="r|xz", fileobj=response) as tar:
             tar.extractall(ndk_root)
 
     rm_rf(ndk_path)
diff --git a/gradle.properties b/gradle.properties
index 5c60749a1..fcfa652e3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,4 +28,4 @@ android.nonTransitiveRClass=true
 # Magisk
 magisk.stubVersion=36
 magisk.versionCode=26102
-magisk.ondkVersion=r25.4
+magisk.ondkVersion=r25.6
diff --git a/native/src/Cargo.toml b/native/src/Cargo.toml
index 88805fb70..680f90383 100644
--- a/native/src/Cargo.toml
+++ b/native/src/Cargo.toml
@@ -1,6 +1,7 @@
 [workspace]
 exclude = ["external"]
 members = ["base", "boot", "core", "init", "sepolicy"]
+resolver = "2"
 
 [workspace.dependencies]
 cxx = { path = "external/cxx-rs" }