TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-03 01:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade ONDK to r25.6

Browse Source
This commit is contained in:
topjohnwu 2023-06-15 01:26:54 -07:00
parent d7d0a44693
commit d3e1c496ca
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.py
View File

@ -446,7 +446,7 @@ def find_jdk():
stdout=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
env=env, env=env,
shell=True shell=True,
) )
no_jdk = proc.returncode != 0 no_jdk = proc.returncode != 0
except FileNotFoundError: except FileNotFoundError:
@ -529,12 +529,12 @@ def cleanup(args):
def setup_ndk(args): def setup_ndk(args):
ndk_ver = config["ondkVersion"] 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] ndk_archive = url.split("/")[-1]
header(f"* Downloading and extracting {ndk_archive}") header(f"* Downloading and extracting {ndk_archive}")
with urllib.request.urlopen(url) as response: 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) tar.extractall(ndk_root)
rm_rf(ndk_path) rm_rf(ndk_path)

2
gradle.properties
View File

@ -28,4 +28,4 @@ android.nonTransitiveRClass=true
# Magisk # Magisk
magisk.stubVersion=36 magisk.stubVersion=36
magisk.versionCode=26102 magisk.versionCode=26102
magisk.ondkVersion=r25.4 magisk.ondkVersion=r25.6

1
native/src/Cargo.toml
View File

@ -1,6 +1,7 @@
[workspace] [workspace]
exclude = ["external"] exclude = ["external"]
members = ["base", "boot", "core", "init", "sepolicy"] members = ["base", "boot", "core", "init", "sepolicy"]
resolver = "2"
[workspace.dependencies] [workspace.dependencies]
cxx = { path = "external/cxx-rs" } cxx = { path = "external/cxx-rs" }