From 53f4e3507b5b8ed0346217f74792f6b576c2e91d Mon Sep 17 00:00:00 2001
From: Hardcore Sushi <hardcore.sushi@disroot.org>
Date: Wed, 22 Jun 2022 22:33:47 +0200
Subject: [PATCH] Fix libcryfs build

---
 BUILD.md           | 8 ++++++++
 app/CMakeLists.txt | 5 +++--
 app/build.gradle   | 2 +-
 app/libcryfs       | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 BUILD.md

diff --git a/BUILD.md b/BUILD.md
new file mode 100644
index 0000000..3c7d3ad
--- /dev/null
+++ b/BUILD.md
@@ -0,0 +1,8 @@
+```
+git submodule update --depth=1 --init
+```
+```
+for i in concepts meta std range; do
+	ln -s /usr/include/$i $ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include;
+done
+```
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 99ff421..20148fd 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.10)
 
+project(DroidFS)
+
 add_subdirectory(${PROJECT_SOURCE_DIR}/libcryfs/)
 
 add_library(
@@ -26,8 +28,7 @@ target_link_libraries(
 )
 
 add_library(cryfs_jni SHARED src/main/native/libcryfs.c)
-#file(GLOB CRYFS_STATIC_LIBRARIES ${PROJECT_SOURCE_DIR}/src/main/jniLibs/${ANDROID_ABI}/lib*.a)
-target_link_libraries(cryfs_jni fspp-fuse)#${CRYFS_STATIC_LIBRARIES})
+target_link_libraries(cryfs_jni fspp-fuse)
 
 add_library(
         avformat
diff --git a/app/build.gradle b/app/build.gradle
index f26ac38..7d098aa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android'
 android {
     compileSdkVersion 31
     buildToolsVersion "31"
-    ndkVersion "24.0.8215888"
+    ndkVersion "23.1.7779620"
 
     compileOptions {
         targetCompatibility JavaVersion.VERSION_1_8
diff --git a/app/libcryfs b/app/libcryfs
index e6d735d..6cd6d9e 160000
--- a/app/libcryfs
+++ b/app/libcryfs
@@ -1 +1 @@
-Subproject commit e6d735dbabbdaf5a746db2097080271a7f7066c3
+Subproject commit 6cd6d9ef5d2f3f41581fbac5d3eb413364714dcf