2 files changed, 28 insertions, 0 deletions

diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/libunwind-fix-strchr-conformance-to-ISO-C23.patch b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/libunwind-fix-strchr-conformance-to-ISO-C23.patch
new file mode 100644
index 0000000000..4da65ea285
--- /dev/null
+++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/debian/external/libunwind/libunwind-fix-strchr-conformance-to-ISO-C23.patch
@@ -0,0 +1,27 @@
+From d91f5324f809c3a5b0343927716e4b99bc31db53 Mon Sep 17 00:00:00 2001
+From: Viswanath Kraleti <viswanath.kraleti@oss.qualcomm.com>
+Date: Fri, 13 Mar 2026 18:57:36 +0530
+Subject: [PATCH] libunwind: fix strchr() conformance to ISO C23
+
+Fix uses of strchr() to conform to ISO C23, supported since glibc-2.43
+
+Signed-off-by: Viswanath Kraleti <viswanath.kraleti@oss.qualcomm.com>
+Upstream-Status: Pending
+---
+ external/libunwind/src/dwarf/Gfind_proc_info-lsb.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/external/libunwind/src/dwarf/Gfind_proc_info-lsb.c b/external/libunwind/src/dwarf/Gfind_proc_info-lsb.c
+index 77ed3d09..37eadf52 100644
+--- a/external/libunwind/src/dwarf/Gfind_proc_info-lsb.c
++++ b/external/libunwind/src/dwarf/Gfind_proc_info-lsb.c
+@@ -248,7 +248,8 @@ load_debug_frame (const char *file, char **buf, size_t *bufsize,
+ 
+   if (*buf == NULL && linkbuf != NULL && memchr (linkbuf, 0, linksize) != NULL)
+     {
+-      char *newname, *basedir, *p;
++      char *newname, *basedir;
++      const char *p;
+       static const char *debugdir = "/usr/lib/debug";
+       int ret;
+ 
diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb
index 74928ed171..3d4e95b496 100644
--- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb
+++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb
@@ -22,6 +22,7 @@ SRC_URI += " \
     file://debian/external/libunwind/legacy_built-in_sync_functions.patch \
     file://debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch \
     file://debian/external/libunwind/libunwind-guard-unreachable-macro-to-avoid-redefinit.patch \
+    file://debian/external/libunwind/libunwind-fix-strchr-conformance-to-ISO-C23.patch \
     \
     file://debian/system/core/move-log-file-to-proper-dir.patch \
     file://debian/system/core/Added-missing-headers.patch \