diff --git a/.gitmodules b/.gitmodules index faf74d247..ac43e2e2c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +13,3 @@ [submodule "native/src/main/jni/liblzma"] path = native/src/main/jni/liblzma url = https://git.tukaani.org/xz.git -[submodule "native/src/main/jni/libzstd"] - path = native/src/main/jni/libzstd - url = https://github.com/facebook/zstd diff --git a/app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt b/app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt index 4956f68ef..3cf9361b3 100644 --- a/app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt +++ b/app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt @@ -41,6 +41,6 @@ class VersionPreference @JvmOverloads constructor( override fun onPrepareDialogBuilder(builder: AlertDialog.Builder) { super.onPrepareDialogBuilder(builder) builder.setTitle(R.string.show_library_version) - builder.setMessage(Native.getlibarchiveVersion() + "\nlzma(xz-utils) " + Native.getliblzmaVersion() + "\nlibzstd " + Native.getlibzstdVersion() + "\nzlib " + Native.getzlibVersion() + "\nlibjpeg-turbo " + Native.getlibjpeg_turboVersion()) + builder.setMessage(Native.getlibarchiveVersion() + "\nlzma(xz-utils) " + Native.getliblzmaVersion() + "\nzlib " + Native.getzlibVersion() + "\nlibjpeg-turbo " + Native.getlibjpeg_turboVersion()) } } \ No newline at end of file diff --git a/native/src/main/jni/CMakeLists.txt b/native/src/main/jni/CMakeLists.txt index 5e42cdbae..d53d8149d 100644 --- a/native/src/main/jni/CMakeLists.txt +++ b/native/src/main/jni/CMakeLists.txt @@ -4,13 +4,6 @@ cmake_minimum_required(VERSION 3.4.1) # Build liblzma add_subdirectory(liblzma) -# Build libzstd -SET(ZSTD_BUILD_SHARED OFF) -add_subdirectory(libzstd/build/cmake) - -# Configure libarchive for android platform -include_directories(libarchive/contrib/android/include) - # Configure lzma support for libarchive include_directories(liblzma/src/liblzma/api) SET(HAVE_LIBLZMA 1) @@ -19,12 +12,6 @@ SET(HAVE_LZMA_STREAM_ENCODER_MT 1) SET(HAVE_LZMADEC_H 1) SET(HAVE_LIBLZMADEC 1) -# Configure zstd support for libarchive -include_directories(libzstd/lib) -SET(HAVE_LIBZSTD 1) -SET(HAVE_LIBZSTD_COMPRESSOR 1) -SET(HAVE_ZSTD_H 1) - # Build libarchive add_subdirectory(libarchive) diff --git a/native/src/main/jni/libarchive b/native/src/main/jni/libarchive index c0896da37..c59388054 160000 --- a/native/src/main/jni/libarchive +++ b/native/src/main/jni/libarchive @@ -1 +1 @@ -Subproject commit c0896da37fe7fc24d2130286dc5ae8796cfd3a92 +Subproject commit c59388054fa0fa45b7539b6a2f881d61afe25f0c diff --git a/native/src/main/jni/libzstd b/native/src/main/jni/libzstd deleted file mode 160000 index e47e674cd..000000000 --- a/native/src/main/jni/libzstd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e47e674cd09583ff0503f0f6defd6d23d8b718d3 diff --git a/native/src/main/jni/main.c b/native/src/main/jni/main.c index 463108a7b..ebb9a3a99 100644 --- a/native/src/main/jni/main.c +++ b/native/src/main/jni/main.c @@ -1,7 +1,6 @@ #include #include #include -#include #include #include "image/libjpeg-turbo/jconfigint.h" @@ -36,11 +35,6 @@ Java_com_hippo_Native_getlibjpeg_1turboVersion(JNIEnv *env, jclass clazz) { return (*env)->NewStringUTF(env, VERSION); } -JNIEXPORT jstring JNICALL -Java_com_hippo_Native_getlibzstdVersion(JNIEnv *env, jclass clazz) { - return (*env)->NewStringUTF(env, ZSTD_VERSION_STRING); -} - JNIEXPORT jstring JNICALL Java_com_hippo_Native_getzlibVersion(JNIEnv *env, jclass clazz) { return (*env)->NewStringUTF(env, ZLIB_VERSION);