Drop zstd archive format support

.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

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())
     }
 }

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)
 

native/src/main/jni/main.c

@@ -1,7 +1,6 @@
 #include <jni.h>
 #include <archive.h>
 #include <lzma.h>
-#include <zstd.h>
 #include <zlib.h>
 #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);