Temporarliy disable jpeg xl

Yeah too large and since i cant split apks yet, I'll save it for next release
This commit is contained in:
Jays2Kings 2022-05-04 16:44:50 -04:00
parent 13d8a79926
commit cc4c8923d7
3 changed files with 18 additions and 3 deletions

View file

@ -50,6 +50,20 @@ android {
ndk { ndk {
abiFilters += supportedAbis abiFilters += supportedAbis
} }
packagingOptions {
jniLibs.excludes.addAll(
listOf(
"**/libjxl.so",
"**/libjxl_dec.so",
"**/libjxl_threads.so",
)
)
}
externalNativeBuild {
cmake {
this.arguments("-DHAVE_LIBJXL=FALSE")
}
}
} }
splits { splits {

View file

@ -48,7 +48,7 @@ class TachiyomiImageDecoder(private val resources: ImageSource, private val opti
ImageUtil.findImageType(it) ImageUtil.findImageType(it)
} }
return when (type) { return when (type) {
ImageUtil.ImageType.AVIF, ImageUtil.ImageType.JXL -> true ImageUtil.ImageType.AVIF/*, ImageUtil.ImageType.JXL */ -> true
ImageUtil.ImageType.HEIF -> Build.VERSION.SDK_INT < Build.VERSION_CODES.O ImageUtil.ImageType.HEIF -> Build.VERSION.SDK_INT < Build.VERSION_CODES.O
else -> false else -> false
} }

View file

@ -46,7 +46,7 @@ object ImageUtil {
Format.Gif -> ImageType.GIF Format.Gif -> ImageType.GIF
Format.Heif -> ImageType.HEIF Format.Heif -> ImageType.HEIF
Format.Jpeg -> ImageType.JPEG Format.Jpeg -> ImageType.JPEG
Format.Jxl -> ImageType.JXL // Format.Jxl -> ImageType.JXL
Format.Png -> ImageType.PNG Format.Png -> ImageType.PNG
Format.Webp -> ImageType.WEBP Format.Webp -> ImageType.WEBP
else -> null else -> null
@ -87,7 +87,8 @@ object ImageUtil {
GIF("image/gif", "gif"), GIF("image/gif", "gif"),
HEIF("image/heif", "heif"), HEIF("image/heif", "heif"),
JPEG("image/jpeg", "jpg"), JPEG("image/jpeg", "jpg"),
JXL("image/jxl", "jxl"),
// JXL("image/jxl", "jxl"),
PNG("image/png", "png"), PNG("image/png", "png"),
WEBP("image/webp", "webp"), WEBP("image/webp", "webp"),
} }