Fix libcryfs build

This commit is contained in:
Matéo Duparc 2022-06-22 22:33:47 +02:00
parent b2ab69c8f2
commit 53f4e3507b
Signed by untrusted user: hardcoresushi
GPG Key ID: AFE384344A45E13A
4 changed files with 13 additions and 4 deletions

8
BUILD.md Normal file
View File

@ -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
```

View File

@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.10)
project(DroidFS)
add_subdirectory(${PROJECT_SOURCE_DIR}/libcryfs/) add_subdirectory(${PROJECT_SOURCE_DIR}/libcryfs/)
add_library( add_library(
@ -26,8 +28,7 @@ target_link_libraries(
) )
add_library(cryfs_jni SHARED src/main/native/libcryfs.c) 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)
target_link_libraries(cryfs_jni fspp-fuse)#${CRYFS_STATIC_LIBRARIES})
add_library( add_library(
avformat avformat

View File

@ -4,7 +4,7 @@ apply plugin: 'kotlin-android'
android { android {
compileSdkVersion 31 compileSdkVersion 31
buildToolsVersion "31" buildToolsVersion "31"
ndkVersion "24.0.8215888" ndkVersion "23.1.7779620"
compileOptions { compileOptions {
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8

@ -1 +1 @@
Subproject commit e6d735dbabbdaf5a746db2097080271a7f7066c3 Subproject commit 6cd6d9ef5d2f3f41581fbac5d3eb413364714dcf