From 844136e19a5e56c8bc195adb9a1df83fef156c09 Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Wed, 13 Nov 2024 11:32:38 -0800 Subject: [PATCH] UPSTREAM: tools: ynl-gen: allow uapi headers in sub-dirs Binder places its headers under include/uapi/linux/android/ Make sure replace / with _ in the uAPI header guard, the c_upper() is more strict and only converts - to _. This is likely a good constraint to have, to enforce sane naming in enums etc. But paths may include /. Signed-off-by: Li Li Link: https://patch.msgid.link/20241113193239.2113577-2-dualli@chromium.org Signed-off-by: Jakub Kicinski Bug: 372832477 (cherry picked from commit 6204656478bec37a3c801cbd6a451e085bbaca41) Change-Id: Ie379a9174d92f7ae14cd8400ac91a6d84e0aeac4 Signed-off-by: Carlos Llamas --- tools/net/ynl/ynl-gen-c.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py index c78f1c1bca75..ce6b52ca011b 100755 --- a/tools/net/ynl/ynl-gen-c.py +++ b/tools/net/ynl/ynl-gen-c.py @@ -2406,6 +2406,7 @@ def uapi_enum_start(family, cw, obj, ckey='', enum_name='enum-name'): def render_uapi(family, cw): hdr_prot = f"_UAPI_LINUX_{c_upper(family.uapi_header_name)}_H" + hdr_prot = hdr_prot.replace('/', '_') cw.p('#ifndef ' + hdr_prot) cw.p('#define ' + hdr_prot) cw.nl()