From abe5a02ef8b8b181e03b0aaa515390c393c11a89 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 9 May 2022 21:51:27 -0700
Subject: [PATCH] Added JXL support on Android
---
Android.mk | 17 +++++++++++++++++
external/libjxl | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Android.mk b/Android.mk
index a72383c..75f94d5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,6 +12,11 @@ DAV1D_LIBRARY_PATH := external/dav1d
SUPPORT_JPG ?= true
JPG_LIBRARY_PATH := external/jpeg
+# Enable this if you want to support loading JPEG-XL images
+# The library path should be a relative path to this directory.
+SUPPORT_JXL ?= true
+JXL_LIBRARY_PATH := external/libjxl
+
# Enable this if you want to support loading PNG images
# The library path should be a relative path to this directory.
SUPPORT_PNG ?= true
@@ -35,6 +40,11 @@ ifeq ($(SUPPORT_JPG),true)
include $(SDL_IMAGE_LOCAL_PATH)/$(JPG_LIBRARY_PATH)/Android.mk
endif
+# Build the library
+ifeq ($(SUPPORT_JXL),true)
+ include $(SDL_IMAGE_LOCAL_PATH)/$(JXL_LIBRARY_PATH)/Android.mk
+endif
+
# Build the library
ifeq ($(SUPPORT_PNG),true)
include $(SDL_IMAGE_LOCAL_PATH)/$(PNG_LIBRARY_PATH)/Android.mk
@@ -96,6 +106,13 @@ ifeq ($(SUPPORT_JPG),true)
LOCAL_STATIC_LIBRARIES += jpeg
endif
+ifeq ($(SUPPORT_JXL),true)
+ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(JXL_LIBRARY_PATH)/lib/include \
+ $(LOCAL_PATH)/$(JXL_LIBRARY_PATH)/android
+ LOCAL_CFLAGS += -DLOAD_JXL
+ LOCAL_STATIC_LIBRARIES += jxl
+endif
+
ifeq ($(SUPPORT_PNG),true)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(PNG_LIBRARY_PATH)
LOCAL_CFLAGS += -DLOAD_PNG
diff --git a/external/libjxl b/external/libjxl
index a205468..4addaa4 160000
--- a/external/libjxl
+++ b/external/libjxl
@@ -1 +1 @@
-Subproject commit a205468bc5d3a353fb15dae2398a101dff52f2d3
+Subproject commit 4addaa413f34aca61c1e6bf45e8d1011203522e7