From b99a9ddab8d91eb1c3eaa243d13b732abb99a57c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 2 Sep 2024 09:59:24 -0300
Subject: [PATCH] f

---
 Android.bp      | 5 ++++-
 libs/Android.bp | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 4df72bbc3..68c162a51 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,7 +32,6 @@ android_app {
         "com.google.android.material_material",
         "kotlinx-coroutines-android",
         "kotlinx-coroutines-core",
-        "seedvault-lib-zstd-jni",
         // our own gradle module libs
         "seedvault-lib-core",
         "seedvault-lib-storage",
@@ -45,6 +44,10 @@ android_app {
         "seedvault-lib-dav4jvm",
         "seedvault-lib-okhttp",
     ],
+    jni_libs: [
+        "seedvault-lib-zstd-jni",
+    ],
+    compile_multilib: "both",
     manifest: "app/src/main/AndroidManifest.xml",
 
     platform_apis: true,
diff --git a/libs/Android.bp b/libs/Android.bp
index 13cbd3900..36158313a 100644
--- a/libs/Android.bp
+++ b/libs/Android.bp
@@ -7,6 +7,7 @@ android_library_import {
     name: "seedvault-lib-zstd-jni",
     aars: ["zstd-jni-1.5.6-5.aar"],
     sdk_version: "current",
+    extract_jni: true,
 }
 
 java_import {