From 836a122e2692f3ab5398ae016e99e331f736a096 Mon Sep 17 00:00:00 2001
From: Star Chang <starchang@google.com>
Date: Thu, 23 Mar 2023 01:42:49 +0000
Subject: [PATCH] ANDROID: Update the ABI symbol list

Adding the following symbols:
  - nf_register_net_hooks
  - nf_unregister_net_hooks

Bug: 238271023
Change-Id: Ia912ee2e8bf3a4c61d8f64eadacacf8ea02332cf
Signed-off-by: Star Chang <starchang@google.com>
---
 android/abi_gki_aarch64.stg   | 104 ++++++++++++++++++++++++++++++++++
 android/abi_gki_aarch64_pixel |   2 +
 2 files changed, 106 insertions(+)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 50fbb446183d..0ad48fb25cf5 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -21365,6 +21365,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0xe5d16cd3
 }
+pointer_reference {
+  id: 0x33e53462
+  kind: POINTER
+  pointee_type_id: 0xe5d43714
+}
 pointer_reference {
   id: 0x33e9627e
   kind: POINTER
@@ -29210,6 +29215,11 @@ qualified {
   qualifier: CONST
   qualified_type_id: 0xe70205c6
 }
+qualified {
+  id: 0xe5d43714
+  qualifier: CONST
+  qualified_type_id: 0xe7176adb
+}
 qualified {
   id: 0xe61b174c
   qualifier: CONST
@@ -90060,6 +90070,19 @@ member {
   name: "hook"
   type_id: 0x1d10c881
 }
+member {
+  id: 0x4baf7b66
+  name: "hook_ops_type"
+  type_id: 0xd62e128a
+  offset: 200
+  bitsize: 8
+}
+member {
+  id: 0xe4d65578
+  name: "hooknum"
+  type_id: 0x4585663f
+  offset: 224
+}
 member {
   id: 0x645b3570
   name: "hooks"
@@ -132170,6 +132193,12 @@ member {
   type_id: 0x914dbfdc
   offset: 64
 }
+member {
+  id: 0xcaa851c4
+  name: "pf"
+  type_id: 0x295c7202
+  offset: 192
+}
 member {
   id: 0xcaa852eb
   name: "pf"
@@ -137267,6 +137296,12 @@ member {
   type_id: 0x6720d32f
   offset: 128
 }
+member {
+  id: 0x10837b6d
+  name: "priority"
+  type_id: 0x6720d32f
+  offset: 256
+}
 member {
   id: 0x10908a33
   name: "priority"
@@ -221773,6 +221808,21 @@ struct_union {
     member_id: 0x59119c40
   }
 }
+struct_union {
+  id: 0xe7176adb
+  kind: STRUCT
+  name: "nf_hook_ops"
+  definition {
+    bytesize: 40
+    member_id: 0xcc6ce804
+    member_id: 0xce0b4088
+    member_id: 0x59119163
+    member_id: 0xcaa851c4
+    member_id: 0x4baf7b66
+    member_id: 0xe4d65578
+    member_id: 0x10837b6d
+  }
+}
 struct_union {
   id: 0xf66ec631
   kind: STRUCT
@@ -252242,6 +252292,20 @@ enumeration {
     }
   }
 }
+enumeration {
+  id: 0xd62e128a
+  name: "nf_hook_ops_type"
+  definition {
+    underlying_type_id: 0x4585663f
+    enumerator {
+      name: "NF_HOOK_OP_UNDEFINED"
+    }
+    enumerator {
+      name: "NF_HOOK_OP_NF_TABLES"
+      value: 1
+    }
+  }
+}
 enumeration {
   id: 0x14ba251a
   name: "nf_log_type"
@@ -262604,6 +262668,13 @@ function {
   parameter_id: 0x0e5eb556
   parameter_id: 0x18bd6530
 }
+function {
+  id: 0x136e393b
+  return_type_id: 0x48b5725f
+  parameter_id: 0x0ca27481
+  parameter_id: 0x33e53462
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x137596b0
   return_type_id: 0x48b5725f
@@ -287820,6 +287891,13 @@ function {
   parameter_id: 0x0a22a423
   parameter_id: 0x084d74bf
 }
+function {
+  id: 0x9e768b87
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0ca27481
+  parameter_id: 0x33e53462
+  parameter_id: 0x4585663f
+}
 function {
   id: 0x9e792fe6
   return_type_id: 0x6720d32f
@@ -314654,6 +314732,24 @@ elf_symbol {
   type_id: 0x104c9db8
   full_name: "nf_conntrack_destroy"
 }
+elf_symbol {
+  id: 0x43078d96
+  name: "nf_register_net_hooks"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x70605ac7
+  type_id: 0x9e768b87
+  full_name: "nf_register_net_hooks"
+}
+elf_symbol {
+  id: 0x619db28f
+  name: "nf_unregister_net_hooks"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xf77ab776
+  type_id: 0x136e393b
+  full_name: "nf_unregister_net_hooks"
+}
 elf_symbol {
   id: 0x915620e9
   name: "nla_find"
@@ -338664,6 +338760,14 @@ symbols {
     key: "nf_conntrack_destroy"
     value: 0xc8ea3547
   }
+  symbol {
+    key: "nf_register_net_hooks"
+    value: 0x43078d96
+  }
+  symbol {
+    key: "nf_unregister_net_hooks"
+    value: 0x619db28f
+  }
   symbol {
     key: "nla_find"
     value: 0x915620e9
diff --git a/android/abi_gki_aarch64_pixel b/android/abi_gki_aarch64_pixel
index 4cf62f999592..cefb9ed0e04d 100644
--- a/android/abi_gki_aarch64_pixel
+++ b/android/abi_gki_aarch64_pixel
@@ -1288,6 +1288,8 @@
   netlink_unregister_notifier
   net_ns_type_operations
   net_ratelimit
+  nf_register_net_hooks
+  nf_unregister_net_hooks
   nla_find
   nla_memcpy
   __nla_parse