From 7074446cae4f646dd76255f184746e89c175c24d Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 14 Feb 2024 17:48:57 -0500 Subject: [PATCH] Removing scrypt native library that doesn't work on Android --- app/build.gradle | 1 + app/proguard-rules.pro | 5 +++++ quartz/build.gradle | 4 ++++ quartz/proguard-rules.pro | 5 +++++ 4 files changed, 15 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index df2c735a8..5664f0d78 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -149,6 +149,7 @@ android { resources { excludes += '/META-INF/{AL2.0,LGPL2.1}' } + exclude '**/libscrypt.dylib' } lint { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 97496bbf1..5b1f59d16 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -33,6 +33,11 @@ # JNA For Libsodium -keep class com.goterl.lazysodium.** { *; } +# libscrypt +-keep class com.lambdaworks.codec.** { *; } +-keep class com.lambdaworks.crypto.** { *; } +-keep class com.lambdaworks.jni.** { *; } + # JNA also requires AWT, which Android does not have. So the classes are broken down to filter AWT out -keep class com.sun.jna.ToNativeConverter { *; } -keep class com.sun.jna.NativeMapped { *; } diff --git a/quartz/build.gradle b/quartz/build.gradle index 3dd64b7cd..f2422b021 100644 --- a/quartz/build.gradle +++ b/quartz/build.gradle @@ -34,6 +34,10 @@ android { jvmTarget = '17' freeCompilerArgs += "-Xstring-concat=inline" } + + packagingOptions { + exclude '**/libscrypt.dylib' + } } dependencies { diff --git a/quartz/proguard-rules.pro b/quartz/proguard-rules.pro index 4727a86be..f2b5c9297 100644 --- a/quartz/proguard-rules.pro +++ b/quartz/proguard-rules.pro @@ -33,6 +33,11 @@ # JNA For Libsodium -keep class com.goterl.lazysodium.** { *; } +# libscrypt +-keep class com.lambdaworks.codec.** { *; } +-keep class com.lambdaworks.crypto.** { *; } +-keep class com.lambdaworks.jni.** { *; } + # JNA also requires AWT, which Android does not have. So the classes are broken down to filter AWT out -keep class com.sun.jna.ToNativeConverter { *; } -keep class com.sun.jna.NativeMapped { *; }