Another way to have all skia static libs in the klib (#239)

skiko/build.gradle.kts

@@ -303,22 +303,14 @@ kotlin {
 
             val unzipper = skiaDirProviderForCrossTargets[osArch]!!
             val unpackedSkia = unzipper.get()
-
             val skiaDir = unpackedSkia.absolutePath
-            val skiaBinSubdir = "out/${buildType.id}-$targetString"
+
+            val bridgesLibrary = "$buildDir/nativeBridges/static/$targetString/skiko-native-bridges-$targetString.a"
+            val allLibraries = skiaStaticLibraries(skiaDir, targetString) + bridgesLibrary
 
             compilation.target.compilations.all {
                 kotlinOptions {
-                    freeCompilerArgs += listOf(
-                            "-include-binary",
-                            "$skiaDir/$skiaBinSubdir/libskia.a",
-                            "-include-binary",
-                            "$skiaDir/$skiaBinSubdir/libskshaper.a",
-                            "-include-binary",
-                            "$skiaDir/$skiaBinSubdir/libskparagraph.a",
-                            "-include-binary",
-                            "$buildDir/nativeBridges/static/$targetString/skiko-native-bridges-$targetString.a"
-                    )
+                    freeCompilerArgs = allLibraries.map{ listOf("-include-binary", it) }.flatten()
                 }
             }
 
@@ -472,6 +464,34 @@ fun skiaPreprocessorFlags(): Array<String> {
     ).toTypedArray()
 }
 
+fun skiaStaticLibraries(skiaDir: String, targetString: String): List<String> {
+    val skiaBinSubdir = "$skiaDir/out/${buildType.id}-$targetString"
+    return listOf(
+        "libskresources.a",
+        "libparticles.a",
+        "libskparagraph.a",
+        "libskia.a",
+        "libicu.a",
+        "libskottie.a",
+        "libsvg.a",
+        "libpng.a",
+        "libfreetype2.a",
+        "libwebp_sse41.a",
+        "libsksg.a",
+        "libskunicode.a",
+        "libwebp.a",
+        "libdng_sdk.a",
+        "libpiex.a",
+        "libharfbuzz.a",
+        "libexpat.a",
+        "libzlib.a",
+        "libjpeg.a",
+        "libskshaper.a"
+    ).map{
+        "$skiaBinSubdir/$it"
+    }
+}
+
 // See https://docs.gradle.org/current/userguide/cpp_library_plugin.html.
 tasks.withType(CppCompile::class.java).configureEach {
     // Prefer 'java.home' system property to simplify overriding from Intellij.