Update to ONDK r27.0

Co-authored-by: LoveSy <[email protected]>
1q23lyc45 · Dec 27, 2024 · 5ea38e3 · 5ea38e3
1 parent 42fa061
commit 5ea38e3
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 18 deletions.
diff --git a/build.py b/build.py
@@ -257,8 +257,6 @@ def run_cargo(cmds, triple="aarch64-linux-android"):
     env["PATH"] = f'{rust_bin}{os.pathsep}{env["PATH"]}'
     env["CARGO_BUILD_RUSTC"] = op.join(rust_bin, "rustc" + EXE_EXT)
     env["RUSTFLAGS"] = f"-Clinker-plugin-lto -Zthreads={min(8, cpu_count)}"
-    env["TARGET_CC"] = op.join(llvm_bin, "clang" + EXE_EXT)
-    env["TARGET_CFLAGS"] = f"--target={triple}23"
     return execv([cargo, *cmds], env)
 
 

diff --git a/buildSrc/src/main/java/Setup.kt b/buildSrc/src/main/java/Setup.kt
@@ -72,7 +72,7 @@ fun Project.setupCommon() {
         compileSdkVersion(34)
         buildToolsVersion = "34.0.0"
         ndkPath = "$sdkDirectory/ndk/magisk"
-        ndkVersion = "26.2.11394342"
+        ndkVersion = "27.0.11718014"
 
         defaultConfig {
             minSdk = 23

diff --git a/gradle.properties b/gradle.properties
@@ -28,4 +28,4 @@ android.nonFinalResIds=false
 # Magisk
 magisk.stubVersion=39
 magisk.versionCode=27002
-magisk.ondkVersion=r26.4
+magisk.ondkVersion=r27.0
diff --git a/native/src/Application.mk b/native/src/Application.mk
@@ -11,7 +11,6 @@ APP_STRIP_MODE   := none
 # Busybox should use stock libc.a
 ifdef B_BB
 APP_PLATFORM     := android-26
-APP_LDFLAGS      += -T src/lto_fix.lds
 ifeq ($(OS),Windows_NT)
 APP_SHORT_COMMANDS := true
 endif

diff --git a/native/src/external/busybox b/native/src/external/busybox
diff --git a/native/src/lto_fix.lds b/native/src/lto_fix.lds
+0 −138		include/sys/syslog.h
+5 −5		libbb/wrap_funcs.c
+0 −1		sysklogd/syslogd_and_logger.c