diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index 931ea9e77..49d4a9ac9 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -161,8 +161,11 @@ android {
         exclude "/fabric/**"
         exclude "/META-INF/*.version"
         exclude "/META-INF/*.kotlin_module"
+        exclude "/META-INF/native-image/**"
         exclude "/builddef.lst"
         exclude "/*.txt"
+        exclude "/DebugProbesKt.bin"
+        exclude "/okhttp3/internal/publicsuffix/NOTICE"
 
     }
 
@@ -254,9 +257,7 @@ android {
     sourceSets {
 
         main {
-            jni {
-                srcDirs = []
-            }
+            jni.srcDirs = []
         }
 
         debug {
@@ -266,6 +267,9 @@ android {
             jni {
                 srcDirs = ["./jni/"]
             }
+            jniLibs {
+                srcDirs = []
+            }
             manifest {
                 srcFile "src/gservcies/AndroidManifest.xml"
             }
@@ -299,12 +303,18 @@ android {
             jni {
                 srcDirs = ["./jni/"]
             }
+            jniLibs {
+                srcDirs = []
+            }
         }
 
         fdroidArm64Release {
             jni {
                 srcDirs = ["./jni/"]
             }
+            jniLibs {
+                srcDirs = []
+            }
         }
 
     }
@@ -433,7 +443,13 @@ dependencies {
 
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
 
-    if (!targetAbi.isBlank()) {
+    def ll = new File("TMessagesProj/libs").list()
+    if (ll == null || ll.length == 0) {
+        System.err.println("Missing libs")
+        System.exit(1)
+    }
+
+    if (!targetAbi.isBlank() && ll.length == 1) {
         implementation project(":ss-rust")
         implementation project(":ssr-libev")
     }