diff --git a/tuta-sdk/android/gradle.properties b/tuta-sdk/android/gradle.properties index c2e84839b0e2..756a0af4322e 100644 --- a/tuta-sdk/android/gradle.properties +++ b/tuta-sdk/android/gradle.properties @@ -21,5 +21,5 @@ android.useAndroidX=true # maximum allowed memory usage org.gradle.jvmargs=-Xmx4096m -# choose which ABI to build (arm, arm64, x86, x86_64) +# choose which ABI to build (arm, arm64, x86_64) #targetABI=arm64 \ No newline at end of file diff --git a/tuta-sdk/android/sdk/build.gradle.kts b/tuta-sdk/android/sdk/build.gradle.kts index 60ff9358c62a..5767ebfae235 100644 --- a/tuta-sdk/android/sdk/build.gradle.kts +++ b/tuta-sdk/android/sdk/build.gradle.kts @@ -26,7 +26,7 @@ fun getABITargets(): List { abi = findProperty("targetABI") as String? return if (abi.isNullOrBlank()) - listOf("arm", "arm64", "x86", "x86_64") + listOf("arm", "arm64", "x86_64") else listOf(abi) } @@ -37,7 +37,6 @@ fun getJNILibsDirs(): List { when (it) { "arm" -> "armeabi-v7a" "arm64" -> "arm64-v8a" - "x86" -> "x86" "x86_64" -> "x86_64" else -> "arm64-v8a" } @@ -56,6 +55,9 @@ android { // Proguard rules that are passed on to the users of the library // See https://developer.android.com/studio/projects/android-library#Considerations consumerProguardFiles("consumer-rules.pro") + + // Limit the ABIs this can be built for; we do not support base x86 + ndk.abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86_64") } buildTypes {