Update ODNK requirement to r25.3

This commit is contained in:
topjohnwu 2023-04-29 15:12:04 -07:00
parent 0cf0d2b821
commit f7de649a36
3 changed files with 25 additions and 5 deletions

View File

@ -257,8 +257,7 @@ def run_cargo_build(args):
write_if_diff(op.join(native_gen_path, f'{p}-rs.hpp'), text) write_if_diff(op.join(native_gen_path, f'{p}-rs.hpp'), text)
# Start building the actual build commands # Start building the actual build commands
cmds = [cargo, 'build', '-Z', 'build-std=std,panic_abort', cmds = [cargo, 'build']
'-Z', 'build-std-features=panic_immediate_abort']
for target in targets: for target in targets:
cmds.append('-p') cmds.append('-p')
cmds.append(target) cmds.append(target)

View File

@ -28,4 +28,4 @@ android.nonTransitiveRClass=true
# Magisk # Magisk
magisk.stubVersion=36 magisk.stubVersion=36
magisk.versionCode=26101 magisk.versionCode=26101
magisk.ondkVersion=r25.2 magisk.ondkVersion=r25.3

View File

@ -1,4 +1,25 @@
[build] [build]
# This is only used to make the IDE happy, the actual compilation will # Choose arm64 as the default target to make the IDE happy.
# have the target overriden by command-line # The actual compilation will have the target overriden by command-line.
target = "aarch64-linux-android" target = "aarch64-linux-android"
[unstable]
build-std = ["std", "panic_abort"]
build-std-features = ["panic_immediate_abort"]
profile-rustflags = true
# Workaround bug for undefined symbol errors that occur with the
# combination of `-Zbuild-std`, `opt-level = "z"`, and `lto = true`.
# compiler_builtins are expected to be built with special flags.
# https://github.com/rust-lang/rust/issues/108853
# https://github.com/rust-lang/wg-cargo-std-aware/issues/62
[profile.release.package.compiler_builtins]
rustflags = ["-Zshare-generics=off"]
overflow-checks = false
debug-assertions = false
[profile.dev.package.compiler_builtins]
rustflags = ["-Zshare-generics=off"]
overflow-checks = false
debug-assertions = false