chore: restore product scaffold to rollback baseline
This commit is contained in:
@@ -352,22 +352,7 @@ fun registerCargoNdkBuildTask(profile: String): TaskProvider<*> {
|
||||
).firstOrNull { File(it).resolve("cargo").exists() }
|
||||
val rustupHome = System.getenv("RUSTUP_HOME") ?: "$homeDir/.rustup"
|
||||
val cargoHome = System.getenv("CARGO_HOME") ?: "$homeDir/.cargo"
|
||||
val hostArch = System.getProperty("os.arch").lowercase()
|
||||
val defaultRustupToolchain = when {
|
||||
org.gradle.internal.os.OperatingSystem.current().isMacOsX && hostArch.contains("aarch64") ->
|
||||
"stable-aarch64-apple-darwin"
|
||||
org.gradle.internal.os.OperatingSystem.current().isMacOsX ->
|
||||
"stable-x86_64-apple-darwin"
|
||||
org.gradle.internal.os.OperatingSystem.current().isWindows && hostArch.contains("aarch64") ->
|
||||
"stable-aarch64-pc-windows-msvc"
|
||||
org.gradle.internal.os.OperatingSystem.current().isWindows ->
|
||||
"stable-x86_64-pc-windows-msvc"
|
||||
hostArch.contains("aarch64") || hostArch.contains("arm64") ->
|
||||
"stable-aarch64-unknown-linux-gnu"
|
||||
else ->
|
||||
"stable-x86_64-unknown-linux-gnu"
|
||||
}
|
||||
val rustupToolchain = System.getenv("RUSTUP_TOOLCHAIN") ?: defaultRustupToolchain
|
||||
val rustupToolchain = System.getenv("RUSTUP_TOOLCHAIN") ?: "stable-aarch64-apple-darwin"
|
||||
|
||||
// SDD-118 item 13 (corrected): per-ABI Exec sub-tasks. Each runs an
|
||||
// isolated `cargo ndk -t <abi> ... -- build ...` so ANDROID_ABI is set
|
||||
@@ -553,7 +538,7 @@ fun registerJniLibsCopyTask(profile: String): TaskProvider<Task> {
|
||||
// version bump replacing libc++_shared.so).
|
||||
inputs.file(bridgeSo).withPropertyName("bridgeSo_$abi")
|
||||
inputs.file(cxxSharedSo).withPropertyName("cxxSharedSo_$abi")
|
||||
inputs.file(llvmStrip).withPropertyName("llvmStrip")
|
||||
inputs.file(llvmStrip).withPropertyName("llvmStrip_$abi")
|
||||
outputs.file(strippedBridgeSo)
|
||||
outputs.file(File(jniLibsDir, "$abi/libchanora_bridge.so"))
|
||||
outputs.file(File(jniLibsDir, "$abi/libc++_shared.so"))
|
||||
|
||||
Reference in New Issue
Block a user