Skip to content

fix: duplicate dynamic libs by retaining the instance of the map #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hurali97 merged 1 commit into from
Dec 3, 2025
Merged

fix: duplicate dynamic libs by retaining the instance of the map #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .../brownfield/src/main/kotlin/com/callstack/react/brownfield/processors/JNILibsProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,14 @@ class JNILibsProcessor : BaseProject() {
it.dependsOn(copyTask)

it.doFirst {
val existingJNILibs =
listOf("arm64-v8a", "armeabi-v7a", "x86_64", "x86")
.associateWith { mutableListOf<String>() }
.toMutableMap()

for (archiveLibrary in aarLibraries) {
val jniDir = archiveLibrary.getJniDir()
processNestedLibs(jniDir.listFiles())
processNestedLibs(jniDir.listFiles(), existingJNILibs)
if (jniDir.exists()) {
val filteredSourceSets = androidExtension.sourceSets.filter { sourceSet -> sourceSet.name == variant.name }
filteredSourceSets.forEach { sourceSet -> sourceSet.jniLibs.srcDir(jniDir) }
Expand Down Expand Up @@ -86,12 +91,10 @@ class JNILibsProcessor : BaseProject() {
}
}

private fun processNestedLibs(files: Array<File>?) {
val existingJNILibs =
listOf("arm64-v8a", "armeabi-v7a", "x86_64", "x86")
.associateWith { mutableListOf<String>() }
.toMutableMap()

private fun processNestedLibs(
files: Array<File>?,
existingJNILibs: MutableMap<String, MutableList<String>>,
) {
files?.forEach { folder ->
val libFiles = folder.listFiles() ?: return@forEach
val libList = existingJNILibs[folder.name] ?: return@forEach
Expand Down