Skip QmlImport scanner if the ABI is not present

mozilla-mobile · Aug 31, 2022 · cd9ca64 · cd9ca64
1 parent e55107d
commit cd9ca64
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/android/buildSrc/src/main/kotlin/QtConfig.kt b/android/buildSrc/src/main/kotlin/QtConfig.kt
@@ -169,6 +169,11 @@ open class QTConfigurationExtension
     // Runs QMLImportscanner from qt_host against the
     // qt_android_<abi> folder, to find out what we need to bundle for qml
     private fun getQMLImports(abi: String): JSONArray {
+        val path = getPath(abi)
+        val abiFolder = File(path)
+        if (!abiFolder.exists()) {
+            return JSONArray()
+        }
         val importScanner = File("$host/libexec/qmlimportscanner")
         if (!importScanner.exists()) {
             error("Did not found qmlimportscanner in $host/libexec/qmlimportscanner")
@@ -179,6 +184,7 @@ open class QTConfigurationExtension
         if (!qmlPath.exists()) {
             return JSONArray()
         }
+        print("Calling: $importScanner -rootPath $qmlPath -importPath $qtQMLPath")
         val process =
             Runtime.getRuntime().exec("$importScanner -rootPath $qmlPath -importPath $qtQMLPath")
         val processOutput = StringBuilder()
@@ -192,7 +198,13 @@ open class QTConfigurationExtension
             }
             process.waitFor()
         }
-        return JSONArray(processOutput.toString())
+        val out = processOutput.toString();
+        try{
+            return JSONArray(out)
+        }catch(e:Exception){
+            error("Got Output of: $out \n ${e.toString()}")
+
+        }
     }
 
     companion object {