Skip to content

Commit fc7a6dc

Browse files
committed
Fix release: ensure arm64 libc++ object goes into release
1 parent b5591a2 commit fc7a6dc

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

build.gradle.kts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,20 @@ tasks.register("copyLibcppShared") {
130130
}
131131
}
132132

133-
// Ensure copyLibcppShared runs before assembling
133+
// Ensure copyLibcppShared runs before native lib merging and assembling
134134
tasks.matching { it.name.contains("assembleRelease") || it.name.contains("assembleDebug") }.configureEach {
135135
dependsOn("copyLibcppShared")
136136
}
137137

138+
// Also ensure copyLibcppShared runs before native library merge tasks
139+
tasks.matching { it.name.contains("mergeReleaseNativeLibs") || it.name.contains("mergeDebugNativeLibs") }.configureEach {
140+
dependsOn("copyLibcppShared")
141+
}
142+
143+
tasks.matching { it.name.contains("mergeReleaseJniLibFolders") || it.name.contains("mergeDebugJniLibFolders") }.configureEach {
144+
dependsOn("copyLibcppShared")
145+
}
146+
138147
// Ensure env vars are applied to the Exec-based cargo tasks
139148
tasks.withType<org.gradle.api.tasks.Exec>()
140149
.matching { it.name.startsWith("cargoBuild") }

0 commit comments

Comments
 (0)