mirror of
https://github.com/topjohnwu/Magisk.git
synced 2024-12-22 16:07:39 +00:00
Update ODNK requirement to r25.3
This commit is contained in:
parent
0cf0d2b821
commit
f7de649a36
3
build.py
3
build.py
@ -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)
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user