Merge remote-tracking branch 'upstream/master' into MOPPAND-1019

open-eid · Sep 22, 2023 · 429389f · 429389f
2 parents 8b10c64 + a55b43d
commit 429389f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/buildSrc/src/main/java/ee/ria/DigiDoc/android/UpdateLibdigidocppTask.java b/buildSrc/src/main/java/ee/ria/DigiDoc/android/UpdateLibdigidocppTask.java
@@ -42,12 +42,10 @@ public class UpdateLibdigidocppTask extends DefaultTask {
     static {
         ABIS.add("arm64-v8a");
         ABIS.add("armeabi-v7a");
-        ABIS.add("x86");
         ABIS.add("x86_64");
 
         ABI_FILES.put("arm64-v8a", "androidarm64");
         ABI_FILES.put("armeabi-v7a", "androidarm");
-        ABI_FILES.put("x86", "androidx86");
         ABI_FILES.put("x86_64", "androidx86_64");
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 appVersionCode=44
 appVersionName=2.6.0
 
-appAbiFilters=arm64-v8a;armeabi-v7a;x86;x86_64
+appAbiFilters=arm64-v8a;armeabi-v7a;x86_64
 
 org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 android.useAndroidX=true