Update to ONDK r27.0

Co-authored-by: LoveSy <shana@zju.edu.cn>

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)
 
 

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

gradle.properties

@@ -28,4 +28,4 @@ android.nonFinalResIds=false
 # Magisk
 magisk.stubVersion=39
 magisk.versionCode=27002
-magisk.ondkVersion=r26.4
+magisk.ondkVersion=r27.0

native/src/Android.mk

@@ -76,11 +76,10 @@ LOCAL_SRC_FILES := \
     init/selinux.cpp \
     init/init-rs.cpp
 
-LOCAL_LDFLAGS := -static -T src/lto_fix.lds
+LOCAL_LDFLAGS := -static
 
 ifdef B_CRT0
 LOCAL_STATIC_LIBRARIES += crt0
-LOCAL_LDFLAGS :=
 endif
 
 include $(BUILD_EXECUTABLE)
@@ -107,11 +106,11 @@ LOCAL_SRC_FILES := \
     boot/format.cpp \
     boot/boot-rs.cpp
 
-LOCAL_LDFLAGS := -static -T src/lto_fix.lds
+LOCAL_LDFLAGS := -static
 
 ifdef B_CRT0
 LOCAL_STATIC_LIBRARIES += crt0
-LOCAL_LDFLAGS := -lm
+LOCAL_LDFLAGS += -lm
 endif
 
 include $(BUILD_EXECUTABLE)

native/src/Application.mk

@@ -17,10 +17,9 @@ NDK_APP_OUT      := ./obj/nolibc
 
 endif
 
-# Busybox should use stock libc.a
+# Busybox should use a newer 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

native/src/external/busybox

@@ -1 +1 @@
-Subproject commit c8a45a3422e38b62a38ba7f5e4e91d3dcacf78f2
+Subproject commit b0f643d5353c2c0156358d87043e25a77bae3047

native/src/external/crt0

@@ -1 +1 @@
-Subproject commit 6f5a10ac125e5f8f83b022b5196deba8051b3e26
+Subproject commit 17233ab90ea37dd86b1867b22c3f243e8a98cd10

native/src/lto_fix.lds

@@ -1,12 +0,0 @@
-SECTIONS {
-  .init_array : {
-    *(SORT_BY_INIT_PRIORITY(.init_array.*))
-    *(EXCLUDE_FILE(*crtend_android.o) .init_array)
-  }
-} INSERT AFTER .fini_array;
-SECTIONS {
-  .fini_array : {
-    *(SORT_BY_INIT_PRIORITY(.fini_array.*))
-    *(EXCLUDE_FILE(*crtend_android.o) .fini_array)
-  }
-} INSERT BEFORE .init_array;