diff --git a/android/abi_gki_aarch64_type_visibility b/android/abi_gki_aarch64_type_visibility
new file mode 100644
index 000000000000..88a3c8813346
--- /dev/null
+++ b/android/abi_gki_aarch64_type_visibility
@@ -0,0 +1,4 @@
+[abi_symbol_list]
+
+# for type visibility
+  GKI_struct_selinux_state
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index 9e70748400a1..70f439aacafe 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -10,6 +10,7 @@ ABI_DEFINITION=android/abi_gki_aarch64.xml
 TIDY_ABI=1
 KMI_SYMBOL_LIST=android/abi_gki_aarch64
 ADDITIONAL_KMI_SYMBOL_LISTS="
+android/abi_gki_aarch64_type_visibility
 android/abi_gki_aarch64_core
 android/abi_gki_aarch64_db845c
 android/abi_gki_aarch64_exynos
diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c
index 0790c299d2be..1ea002e1f230 100644
--- a/drivers/android/vendor_hooks.c
+++ b/drivers/android/vendor_hooks.c
@@ -53,7 +53,6 @@
 #include <trace/hooks/logbuf.h>
 #include <trace/hooks/vmscan.h>
 #include <trace/hooks/psi.h>
-#include <trace/hooks/selinux.h>
 #include <trace/hooks/hung_task.h>
 #include <trace/hooks/mmc_core.h>
 #include <trace/hooks/v4l2core.h>
@@ -336,7 +335,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_dequeue_task_fair);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_sched_stat_runtime_rt);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_prepare_update_load_avg_se);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_finish_update_load_avg_se);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_selinux_is_initialized);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_tune_inactive_ratio);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_update_topology_flags_workfn);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_of_i2c_get_board_info);
diff --git a/security/selinux/Makefile b/security/selinux/Makefile
index 4d8e0e8adf0b..8e8102b558b4 100644
--- a/security/selinux/Makefile
+++ b/security/selinux/Makefile
@@ -10,6 +10,8 @@ selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o \
 	     ss/ebitmap.o ss/hashtab.o ss/symtab.o ss/sidtab.o ss/avtab.o \
 	     ss/policydb.o ss/services.o ss/conditional.o ss/mls.o ss/context.o
 
+selinux-$(CONFIG_ANDROID_VENDOR_HOOKS) += vendor_hooks.o
+
 selinux-$(CONFIG_SECURITY_NETWORK_XFRM) += xfrm.o
 
 selinux-$(CONFIG_NETLABEL) += netlabel.o
diff --git a/security/selinux/vendor_hooks.c b/security/selinux/vendor_hooks.c
new file mode 100644
index 000000000000..3802e8233289
--- /dev/null
+++ b/security/selinux/vendor_hooks.c
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/* vendor_hook.c
+ *
+ * Copyright 2022 Google LLC
+ */
+
+#ifndef __GENKSYMS__
+#include "security.h"
+#endif
+
+#define CREATE_TRACE_POINTS
+#include <trace/hooks/vendor_hooks.h>
+#include <linux/tracepoint.h>
+#include <trace/hooks/selinux.h>
+
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_selinux_is_initialized);
+
+/*
+ * For type visibility
+ */
+struct selinux_state *GKI_struct_selinux_state;
+EXPORT_SYMBOL_GPL(GKI_struct_selinux_state);