From eca1fec2ba0cd71737bed04f8645b9aa09cfe04a Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain.becker@gmail.com>
Date: Thu, 5 Sep 2024 11:24:42 +0200
Subject: [PATCH] Android: add path to "pnglibconf.h" for compilation with
 libpng, and path to "jconfig.h" for compilation with libjpeg.

(cherry picked from commit 382b97225d1d2d59f691d97ff809ffc12bed73b2)
---
 Android.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index bf2b1810..29793f74 100644
--- a/Android.mk
+++ b/Android.mk
@@ -112,7 +112,8 @@ ifeq ($(SUPPORT_AVIF),true)
 endif
 
 ifeq ($(SUPPORT_JPG),true)
-    LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(JPG_LIBRARY_PATH)
+    LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(JPG_LIBRARY_PATH)              \
+                        $(LOCAL_PATH)/$(JPG_LIBRARY_PATH)/android
     LOCAL_CFLAGS += -DLOAD_JPG
     LOCAL_STATIC_LIBRARIES += jpeg
 ifeq ($(SUPPORT_SAVE_JPG),true)
@@ -130,7 +131,8 @@ ifeq ($(SUPPORT_JXL),true)
 endif
 
 ifeq ($(SUPPORT_PNG),true)
-    LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(PNG_LIBRARY_PATH)
+    LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(PNG_LIBRARY_PATH)             \
+                        $(LOCAL_PATH)/$(PNG_LIBRARY_PATH)/android
     LOCAL_CFLAGS += -DLOAD_PNG
     LOCAL_STATIC_LIBRARIES += png
     LOCAL_LDLIBS += -lz