Maintenance (#667)

Revert "Android: removing deprecated armeabi-v7a"
coronalabs · Dec 17, 2023 · bbb709c · bbb709c
1 parent 9aa29aa
commit bbb709c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/platform/android/app/build.gradle.kts b/platform/android/app/build.gradle.kts
@@ -200,9 +200,6 @@ android {
         versionCode = coronaVersionCode
         versionName = coronaVersionName
         multiDexEnabled = true
-        ndk {
-            abiFilters += listOf("arm64-v8a", "x86", "x86_64")
-        }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
@@ -727,9 +724,32 @@ fun downloadAndProcessCoronaPlugins(reDownloadPlugins: Boolean = true) {
         }
     }
 
-    logger.lifecycle("Clean up libraries")
+    logger.lifecycle("Collecting native libraries")
     run {
         delete(generatedPluginNativeLibsDir)
+        file(coronaPlugins).walk().maxDepth(1).forEach {
+            if (it == coronaPlugins) return@forEach
+            if (pluginDisabledNative.contains(it.name)) return@forEach
+
+            val hasJniLibs = !fileTree(it) {
+                include("**/jniLibs/**/*.so")
+            }.isEmpty
+            val armeabiV7Libs = fileTree(it) {
+                include("**/*.so")
+            }
+            val hasArm32Libs = !armeabiV7Libs.isEmpty
+            if (!hasJniLibs && hasArm32Libs) {
+                logger.error("WARNING: Plugin '$it' contain native library for armeabi-v7a but not for arm64.")
+                copy {
+                    from(armeabiV7Libs)
+                    into(generatedPluginNativeLibsDir)
+                    eachFile {
+                        path = "armeabi-v7a/$name"
+                    }
+                    includeEmptyDirs = false
+                }
+            }
+        }
     }
 
     logger.lifecycle("Collecting legacy jar libraries")

diff --git a/platform/android/sdk/build.gradle.kts b/platform/android/sdk/build.gradle.kts
@@ -10,9 +10,6 @@ android {
         minSdk = 15
         targetSdk = 33
         version = 1
-        ndk {
-            abiFilters += listOf("arm64-v8a", "x86", "x86_64")
-        }
     }
     sourceSets["main"].manifest.srcFile(file("AndroidManifest-New.xml"))
     sourceSets["main"].java.srcDirs(file("src"), file("../../../external/JNLua/src/main"), file("../../../plugins/network/android/src"))