From dfec5625947afad000c8ea8e25c8b13c908b11cc Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Thu, 7 Mar 2024 10:31:13 +0100
Subject: [PATCH] kernel: Add clean headers script to workaround conflicts with
 bionic

After the "Avoid multiple definitions of sigaction." change in bionic,
we ought to modify our kernel headers to make sure that sigaction struct
is not present in uapi headers.

Change-Id: I15645480e013e79cbcafaac99253368b646b6b11
---
 build/soong/Android.bp | 2 +-
 tools/clean_headers.sh | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100755 tools/clean_headers.sh

diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 2a21c5c0..47e5f0b2 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -21,7 +21,7 @@ lineage_generator {
     name: "generated_kernel_includes",
 
     // The headers make command
-    cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install",
+    cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install && vendor/lineage/tools/clean_headers.sh $(KERNEL_BUILD_OUT_PREFIX)$(genDir)",
 
     // Directories that can be imported by a cc_* module generated_headers property
     export_include_dirs: [
diff --git a/tools/clean_headers.sh b/tools/clean_headers.sh
new file mode 100755
index 00000000..627f6466
--- /dev/null
+++ b/tools/clean_headers.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -eu
+
+export ANDROID_BUILD_TOP="$PWD"
+
+./bionic/libc/kernel/tools/clean_header.py -u \
+    "$1/usr/include/asm-generic/signal.h"