From 2431799f21a1a1edb180876ff4d8a6d9d66deef5 Mon Sep 17 00:00:00 2001
From: xieliujie <xieliujie@oppo.com>
Date: Thu, 4 May 2023 19:22:12 +0800
Subject: [PATCH] ANDROID: ABI: Update oplus symbol list

20 function symbol(s) added
  'int __traceiter_android_vh_alter_mutex_list_add(void*, struct mutex*, struct mutex_waiter*, struct list_head*, bool*)'
  'int __traceiter_android_vh_binder_free_proc(void*, struct binder_proc*)'
  'int __traceiter_android_vh_binder_has_work_ilocked(void*, struct binder_thread*, bool, int*)'
  'int __traceiter_android_vh_binder_looper_state_registered(void*, struct binder_thread*, struct binder_proc*)'
  'int __traceiter_android_vh_binder_preset(void*, struct hlist_head*, struct mutex*)'
  'int __traceiter_android_vh_binder_priority_skip(void*, struct task_struct*, bool*)'
  'int __traceiter_android_vh_binder_proc_transaction_entry(void*, struct binder_proc*, struct binder_transaction*, struct binder_thread**, int, bool, bool, bool*)'
  'int __traceiter_android_vh_binder_proc_transaction_finish(void*, struct binder_proc*, struct binder_transaction*, struct task_struct*, bool, bool)'
  'int __traceiter_android_vh_binder_read_done(void*, struct binder_proc*, struct binder_thread*)'
  'int __traceiter_android_vh_binder_select_worklist_ilocked(void*, struct list_head**, struct binder_thread*, struct binder_proc*, int)'
  'int __traceiter_android_vh_binder_thread_read(void*, struct list_head**, struct binder_proc*, struct binder_thread*)'
  'int __traceiter_android_vh_binder_thread_release(void*, struct binder_proc*, struct binder_thread*)'
  'int __traceiter_android_vh_mutex_can_spin_on_owner(void*, struct mutex*, int*)'
  'int __traceiter_android_vh_mutex_opt_spin_finish(void*, struct mutex*, bool)'
  'int __traceiter_android_vh_mutex_opt_spin_start(void*, struct mutex*, bool*, int*)'
  'int __traceiter_android_vh_mutex_unlock_slowpath(void*, struct mutex*)'
  'int __traceiter_android_vh_rwsem_can_spin_on_owner(void*, struct rw_semaphore*, bool*)'
  'int __traceiter_android_vh_rwsem_opt_spin_finish(void*, struct rw_semaphore*, bool)'
  'int __traceiter_android_vh_rwsem_opt_spin_start(void*, struct rw_semaphore*, bool*, int*, bool)'
  'int __traceiter_android_vh_rwsem_wake_finish(void*, struct rw_semaphore*)'

20 variable symbol(s) added
  'struct tracepoint __tracepoint_android_vh_alter_mutex_list_add'
  'struct tracepoint __tracepoint_android_vh_binder_free_proc'
  'struct tracepoint __tracepoint_android_vh_binder_has_work_ilocked'
  'struct tracepoint __tracepoint_android_vh_binder_looper_state_registered'
  'struct tracepoint __tracepoint_android_vh_binder_preset'
  'struct tracepoint __tracepoint_android_vh_binder_priority_skip'
  'struct tracepoint __tracepoint_android_vh_binder_proc_transaction_entry'
  'struct tracepoint __tracepoint_android_vh_binder_proc_transaction_finish'
  'struct tracepoint __tracepoint_android_vh_binder_read_done'
  'struct tracepoint __tracepoint_android_vh_binder_select_worklist_ilocked'
  'struct tracepoint __tracepoint_android_vh_binder_thread_read'
  'struct tracepoint __tracepoint_android_vh_binder_thread_release'
  'struct tracepoint __tracepoint_android_vh_mutex_can_spin_on_owner'
  'struct tracepoint __tracepoint_android_vh_mutex_opt_spin_finish'
  'struct tracepoint __tracepoint_android_vh_mutex_opt_spin_start'
  'struct tracepoint __tracepoint_android_vh_mutex_unlock_slowpath'
  'struct tracepoint __tracepoint_android_vh_rwsem_can_spin_on_owner'
  'struct tracepoint __tracepoint_android_vh_rwsem_opt_spin_finish'
  'struct tracepoint __tracepoint_android_vh_rwsem_opt_spin_start'
  'struct tracepoint __tracepoint_android_vh_rwsem_wake_finish'

Bug: 193384408
Change-Id: Ib482ef721ae17447fba23153eb3cae3ec86b9666
Signed-off-by: xieliujie <xieliujie@oppo.com>
---
 android/abi_gki_aarch64.stg   | 680 ++++++++++++++++++++++++++++++++++
 android/abi_gki_aarch64_oplus |  40 ++
 2 files changed, 720 insertions(+)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 490bfc509774..30e2542de5bf 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -1005,6 +1005,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x2433570e
 }
+pointer_reference {
+  id: 0x039df521
+  kind: POINTER
+  pointee_type_id: 0x24373219
+}
 pointer_reference {
   id: 0x03a40599
   kind: POINTER
@@ -1400,6 +1405,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x3e504ae2
 }
+pointer_reference {
+  id: 0x0508b7df
+  kind: POINTER
+  pointee_type_id: 0x3e6239e1
+}
 pointer_reference {
   id: 0x050d6bc0
   kind: POINTER
@@ -9845,6 +9855,11 @@ pointer_reference {
   kind: POINTER
   pointee_type_id: 0x4e376b5d
 }
+pointer_reference {
+  id: 0x19227de2
+  kind: POINTER
+  pointee_type_id: 0x4ec91117
+}
 pointer_reference {
   id: 0x19341e7e
   kind: POINTER
@@ -209762,6 +209777,12 @@ member {
   type_id: 0x2c32dd96
   offset: 640
 }
+member {
+  id: 0x3190e947
+  name: "ww_ctx"
+  type_id: 0x2c32dd96
+  offset: 192
+}
 member {
   id: 0xa0232669
   name: "x"
@@ -246768,6 +246789,17 @@ struct_union {
     member_id: 0x46d7c426
   }
 }
+struct_union {
+  id: 0x4ec91117
+  kind: STRUCT
+  name: "mutex_waiter"
+  definition {
+    bytesize: 32
+    member_id: 0x7c00ef52
+    member_id: 0x9c3a2ac5
+    member_id: 0x3190e947
+  }
+}
 struct_union {
   id: 0x6e3846e1
   kind: STRUCT
@@ -323214,6 +323246,31 @@ function {
   parameter_id: 0x1042c9d1
   parameter_id: 0x3eb9b5ea
 }
+function {
+  id: 0x9b24741c
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x24373219
+  parameter_id: 0x6d7f5ff6
+  parameter_id: 0x13580d6c
+}
+function {
+  id: 0x9b248c83
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x2360e10b
+  parameter_id: 0x19227de2
+  parameter_id: 0x3e6239e1
+  parameter_id: 0x11cfee5a
+}
+function {
+  id: 0x9b26077c
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x2360e10b
+  parameter_id: 0x11cfee5a
+  parameter_id: 0x13580d6c
+}
 function {
   id: 0x9b261113
   return_type_id: 0x6720d32f
@@ -323239,6 +323296,13 @@ function {
   parameter_id: 0x6720d32f
   parameter_id: 0x09e67e75
 }
+function {
+  id: 0x9b26efe4
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x2360e10b
+  parameter_id: 0x13580d6c
+}
 function {
   id: 0x9b2899c2
   return_type_id: 0x6720d32f
@@ -323315,6 +323379,20 @@ function {
   parameter_id: 0x18ea6ae3
   parameter_id: 0x2360e10b
 }
+function {
+  id: 0x9b3885c4
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x24373219
+  parameter_id: 0x1f8dbf97
+}
+function {
+  id: 0x9b396630
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x2360e10b
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x9b3a4e29
   return_type_id: 0x6720d32f
@@ -324691,6 +324769,13 @@ function {
   parameter_id: 0x00c83ba6
   parameter_id: 0x11cfee5a
 }
+function {
+  id: 0x9ba93092
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x00be4281
+  parameter_id: 0x11cfee5a
+}
 function {
   id: 0x9ba938bd
   return_type_id: 0x6720d32f
@@ -324706,6 +324791,15 @@ function {
   parameter_id: 0x13580d6c
   parameter_id: 0x1b8590a8
 }
+function {
+  id: 0x9ba966ad
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x00be4281
+  parameter_id: 0x11cfee5a
+  parameter_id: 0x13580d6c
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x9ba9c2f7
   return_type_id: 0x6720d32f
@@ -324833,6 +324927,15 @@ function {
   parameter_id: 0x0d5f1839
   parameter_id: 0xa2114faf
 }
+function {
+  id: 0x9bb2f28e
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x0508b7df
+  parameter_id: 0x24373219
+  parameter_id: 0x1f8dbf97
+  parameter_id: 0x6720d32f
+}
 function {
   id: 0x9bb5868f
   return_type_id: 0x6720d32f
@@ -324842,6 +324945,13 @@ function {
   parameter_id: 0x11cfee5a
   parameter_id: 0x11cfee5a
 }
+function {
+  id: 0x9bb61cbe
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x00be4281
+  parameter_id: 0x6d7f5ff6
+}
 function {
   id: 0x9bb62df9
   return_type_id: 0x6720d32f
@@ -324945,6 +325055,14 @@ function {
   parameter_id: 0x18bd6530
   parameter_id: 0x33756485
 }
+function {
+  id: 0x9bbceb0f
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x0508b7df
+  parameter_id: 0x1f8dbf97
+  parameter_id: 0x24373219
+}
 function {
   id: 0x9bbcf106
   return_type_id: 0x6720d32f
@@ -325226,6 +325344,18 @@ function {
   parameter_id: 0x2e029f76
   parameter_id: 0x11cfee5a
 }
+function {
+  id: 0x9bd130b8
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x1f8dbf97
+  parameter_id: 0x02a8d0c9
+  parameter_id: 0x039df521
+  parameter_id: 0x6720d32f
+  parameter_id: 0x6d7f5ff6
+  parameter_id: 0x6d7f5ff6
+  parameter_id: 0x11cfee5a
+}
 function {
   id: 0x9bd14074
   return_type_id: 0x6720d32f
@@ -325233,6 +325363,22 @@ function {
   parameter_id: 0x18bd6530
   parameter_id: 0x2731dd86
 }
+function {
+  id: 0x9bd14825
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x1f8dbf97
+  parameter_id: 0x02a8d0c9
+  parameter_id: 0x1d19a9d5
+  parameter_id: 0x6d7f5ff6
+  parameter_id: 0x6d7f5ff6
+}
+function {
+  id: 0x9bd18c9d
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x1f8dbf97
+}
 function {
   id: 0x9bd21a8b
   return_type_id: 0x6720d32f
@@ -325253,6 +325399,13 @@ function {
   parameter_id: 0x18bd6530
   parameter_id: 0x2f7b7919
 }
+function {
+  id: 0x9bd3af7a
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x1d33485a
+  parameter_id: 0x2360e10b
+}
 function {
   id: 0x9bd4393a
   return_type_id: 0x6720d32f
@@ -325454,6 +325607,13 @@ function {
   parameter_id: 0x1c3dbe5a
   parameter_id: 0x1c898f28
 }
+function {
+  id: 0x9bd88151
+  return_type_id: 0x6720d32f
+  parameter_id: 0x18bd6530
+  parameter_id: 0x1f8dbf97
+  parameter_id: 0x24373219
+}
 function {
   id: 0x9bd88c03
   return_type_id: 0x6720d32f
@@ -339813,6 +339973,15 @@ elf_symbol {
   type_id: 0x9be1ca34
   full_name: "__traceiter_android_vh_alter_futex_plist_add"
 }
+elf_symbol {
+  id: 0xd5431a65
+  name: "__traceiter_android_vh_alter_mutex_list_add"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x73585e82
+  type_id: 0x9b248c83
+  full_name: "__traceiter_android_vh_alter_mutex_list_add"
+}
 elf_symbol {
   id: 0xb288a9fe
   name: "__traceiter_android_vh_alter_rwsem_list_add"
@@ -339840,6 +340009,78 @@ elf_symbol {
   type_id: 0x9b2d3bb4
   full_name: "__traceiter_android_vh_audio_usb_offload_connect"
 }
+elf_symbol {
+  id: 0xbebf7d98
+  name: "__traceiter_android_vh_binder_free_proc"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x1542af58
+  type_id: 0x9bd18c9d
+  full_name: "__traceiter_android_vh_binder_free_proc"
+}
+elf_symbol {
+  id: 0x6935b08b
+  name: "__traceiter_android_vh_binder_has_work_ilocked"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x5c2cc3f5
+  type_id: 0x9b24741c
+  full_name: "__traceiter_android_vh_binder_has_work_ilocked"
+}
+elf_symbol {
+  id: 0xd595bd2c
+  name: "__traceiter_android_vh_binder_looper_state_registered"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x0a013010
+  type_id: 0x9b3885c4
+  full_name: "__traceiter_android_vh_binder_looper_state_registered"
+}
+elf_symbol {
+  id: 0xbff39e0e
+  name: "__traceiter_android_vh_binder_preset"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x6fb34c67
+  type_id: 0x9bd3af7a
+  full_name: "__traceiter_android_vh_binder_preset"
+}
+elf_symbol {
+  id: 0xae7d043c
+  name: "__traceiter_android_vh_binder_priority_skip"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xa87112a0
+  type_id: 0x9bdfaf3f
+  full_name: "__traceiter_android_vh_binder_priority_skip"
+}
+elf_symbol {
+  id: 0x8df3721b
+  name: "__traceiter_android_vh_binder_proc_transaction_entry"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xb52877f8
+  type_id: 0x9bd130b8
+  full_name: "__traceiter_android_vh_binder_proc_transaction_entry"
+}
+elf_symbol {
+  id: 0x20dbced6
+  name: "__traceiter_android_vh_binder_proc_transaction_finish"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x3af55c70
+  type_id: 0x9bd14825
+  full_name: "__traceiter_android_vh_binder_proc_transaction_finish"
+}
+elf_symbol {
+  id: 0x5c1ee0c5
+  name: "__traceiter_android_vh_binder_read_done"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x6d5e4c7d
+  type_id: 0x9bd88151
+  full_name: "__traceiter_android_vh_binder_read_done"
+}
 elf_symbol {
   id: 0xc6c9353c
   name: "__traceiter_android_vh_binder_restore_priority"
@@ -339849,6 +340090,15 @@ elf_symbol {
   type_id: 0x9ba25f4a
   full_name: "__traceiter_android_vh_binder_restore_priority"
 }
+elf_symbol {
+  id: 0xd738b678
+  name: "__traceiter_android_vh_binder_select_worklist_ilocked"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x792d9054
+  type_id: 0x9bb2f28e
+  full_name: "__traceiter_android_vh_binder_select_worklist_ilocked"
+}
 elf_symbol {
   id: 0x2a9c6616
   name: "__traceiter_android_vh_binder_set_priority"
@@ -339858,6 +340108,24 @@ elf_symbol {
   type_id: 0x9ba25f4a
   full_name: "__traceiter_android_vh_binder_set_priority"
 }
+elf_symbol {
+  id: 0x4785a3dd
+  name: "__traceiter_android_vh_binder_thread_read"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xb66ecca0
+  type_id: 0x9bbceb0f
+  full_name: "__traceiter_android_vh_binder_thread_read"
+}
+elf_symbol {
+  id: 0x25f13dbe
+  name: "__traceiter_android_vh_binder_thread_release"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x0b46e6d9
+  type_id: 0x9bd88151
+  full_name: "__traceiter_android_vh_binder_thread_release"
+}
 elf_symbol {
   id: 0x5cf60b10
   name: "__traceiter_android_vh_binder_transaction_init"
@@ -340173,6 +340441,42 @@ elf_symbol {
   type_id: 0x9b6e7eee
   full_name: "__traceiter_android_vh_map_util_freq"
 }
+elf_symbol {
+  id: 0xb1c564a3
+  name: "__traceiter_android_vh_mutex_can_spin_on_owner"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x0a590b0a
+  type_id: 0x9b26efe4
+  full_name: "__traceiter_android_vh_mutex_can_spin_on_owner"
+}
+elf_symbol {
+  id: 0x17b175ff
+  name: "__traceiter_android_vh_mutex_opt_spin_finish"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x74423a59
+  type_id: 0x9b396630
+  full_name: "__traceiter_android_vh_mutex_opt_spin_finish"
+}
+elf_symbol {
+  id: 0x2a856841
+  name: "__traceiter_android_vh_mutex_opt_spin_start"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x86b310b3
+  type_id: 0x9b26077c
+  full_name: "__traceiter_android_vh_mutex_opt_spin_start"
+}
+elf_symbol {
+  id: 0x0b2ba11b
+  name: "__traceiter_android_vh_mutex_unlock_slowpath"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xc594cc4a
+  type_id: 0x9b2239e7
+  full_name: "__traceiter_android_vh_mutex_unlock_slowpath"
+}
 elf_symbol {
   id: 0xe17999f4
   name: "__traceiter_android_vh_mutex_wait_finish"
@@ -340272,6 +340576,15 @@ elf_symbol {
   type_id: 0x9beff51f
   full_name: "__traceiter_android_vh_rtmutex_wait_start"
 }
+elf_symbol {
+  id: 0x5858f827
+  name: "__traceiter_android_vh_rwsem_can_spin_on_owner"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xea91282f
+  type_id: 0x9ba93092
+  full_name: "__traceiter_android_vh_rwsem_can_spin_on_owner"
+}
 elf_symbol {
   id: 0xb1847a6f
   name: "__traceiter_android_vh_rwsem_init"
@@ -340281,6 +340594,24 @@ elf_symbol {
   type_id: 0x9bad4369
   full_name: "__traceiter_android_vh_rwsem_init"
 }
+elf_symbol {
+  id: 0x958d8cdb
+  name: "__traceiter_android_vh_rwsem_opt_spin_finish"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x4d4fd1ae
+  type_id: 0x9bb61cbe
+  full_name: "__traceiter_android_vh_rwsem_opt_spin_finish"
+}
+elf_symbol {
+  id: 0xfde8086a
+  name: "__traceiter_android_vh_rwsem_opt_spin_start"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xe6397efc
+  type_id: 0x9ba966ad
+  full_name: "__traceiter_android_vh_rwsem_opt_spin_start"
+}
 elf_symbol {
   id: 0xbffefc2b
   name: "__traceiter_android_vh_rwsem_read_wait_finish"
@@ -340308,6 +340639,15 @@ elf_symbol {
   type_id: 0x9bad4369
   full_name: "__traceiter_android_vh_rwsem_wake"
 }
+elf_symbol {
+  id: 0x6fe41dd1
+  name: "__traceiter_android_vh_rwsem_wake_finish"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xc0b44785
+  type_id: 0x9bad4369
+  full_name: "__traceiter_android_vh_rwsem_wake_finish"
+}
 elf_symbol {
   id: 0x7945e8fa
   name: "__traceiter_android_vh_rwsem_write_finished"
@@ -341793,6 +342133,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_alter_futex_plist_add"
 }
+elf_symbol {
+  id: 0xe520cb67
+  name: "__tracepoint_android_vh_alter_mutex_list_add"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x7dbea13a
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_alter_mutex_list_add"
+}
 elf_symbol {
   id: 0x8184b548
   name: "__tracepoint_android_vh_alter_rwsem_list_add"
@@ -341820,6 +342169,78 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_audio_usb_offload_connect"
 }
+elf_symbol {
+  id: 0xf32898c6
+  name: "__tracepoint_android_vh_binder_free_proc"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x9e624858
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_binder_free_proc"
+}
+elf_symbol {
+  id: 0x332635cd
+  name: "__tracepoint_android_vh_binder_has_work_ilocked"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x68da440b
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_binder_has_work_ilocked"
+}
+elf_symbol {
+  id: 0xf06625d6
+  name: "__tracepoint_android_vh_binder_looper_state_registered"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xb59ca220
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_binder_looper_state_registered"
+}
+elf_symbol {
+  id: 0x95c75a1c
+  name: "__tracepoint_android_vh_binder_preset"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xf03cd6d3
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_binder_preset"
+}
+elf_symbol {
+  id: 0xe3a367fe
+  name: "__tracepoint_android_vh_binder_priority_skip"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x7c25b934
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_binder_priority_skip"
+}
+elf_symbol {
+  id: 0xb6cfb459
+  name: "__tracepoint_android_vh_binder_proc_transaction_entry"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xd172a0f8
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_binder_proc_transaction_entry"
+}
+elf_symbol {
+  id: 0xc6a5dbd8
+  name: "__tracepoint_android_vh_binder_proc_transaction_finish"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x7fff70e0
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_binder_proc_transaction_finish"
+}
+elf_symbol {
+  id: 0x54aac8cb
+  name: "__tracepoint_android_vh_binder_read_done"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x037a6751
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_binder_read_done"
+}
 elf_symbol {
   id: 0x57a9a36a
   name: "__tracepoint_android_vh_binder_restore_priority"
@@ -341829,6 +342250,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_binder_restore_priority"
 }
+elf_symbol {
+  id: 0x21d8d29a
+  name: "__tracepoint_android_vh_binder_select_worklist_ilocked"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xbc728def
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_binder_select_worklist_ilocked"
+}
 elf_symbol {
   id: 0x2e04cb9c
   name: "__tracepoint_android_vh_binder_set_priority"
@@ -341838,6 +342268,24 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_binder_set_priority"
 }
+elf_symbol {
+  id: 0x306b5ff7
+  name: "__tracepoint_android_vh_binder_thread_read"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x1a799b23
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_binder_thread_read"
+}
+elf_symbol {
+  id: 0x2fce8f78
+  name: "__tracepoint_android_vh_binder_thread_release"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x5ee63788
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_binder_thread_release"
+}
 elf_symbol {
   id: 0xa9d55136
   name: "__tracepoint_android_vh_binder_transaction_init"
@@ -342153,6 +342601,42 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_map_util_freq"
 }
+elf_symbol {
+  id: 0xd5097f8d
+  name: "__tracepoint_android_vh_mutex_can_spin_on_owner"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x80558a5f
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_mutex_can_spin_on_owner"
+}
+elf_symbol {
+  id: 0xecc3ea35
+  name: "__tracepoint_android_vh_mutex_opt_spin_finish"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xa0e404b1
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_mutex_opt_spin_finish"
+}
+elf_symbol {
+  id: 0x2122908b
+  name: "__tracepoint_android_vh_mutex_opt_spin_start"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xb4b26237
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_mutex_opt_spin_start"
+}
+elf_symbol {
+  id: 0x68d68809
+  name: "__tracepoint_android_vh_mutex_unlock_slowpath"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0xf5dc2012
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_mutex_unlock_slowpath"
+}
 elf_symbol {
   id: 0x76e879b6
   name: "__tracepoint_android_vh_mutex_wait_finish"
@@ -342252,6 +342736,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_rtmutex_wait_start"
 }
+elf_symbol {
+  id: 0xe471b8d5
+  name: "__tracepoint_android_vh_rwsem_can_spin_on_owner"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x017248e7
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_rwsem_can_spin_on_owner"
+}
 elf_symbol {
   id: 0x84628825
   name: "__tracepoint_android_vh_rwsem_init"
@@ -342261,6 +342754,24 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_rwsem_init"
 }
+elf_symbol {
+  id: 0x8d0ce77d
+  name: "__tracepoint_android_vh_rwsem_opt_spin_finish"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x7dc06ab2
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_rwsem_opt_spin_finish"
+}
+elf_symbol {
+  id: 0x50ab483c
+  name: "__tracepoint_android_vh_rwsem_opt_spin_start"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x9da0a858
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_rwsem_opt_spin_start"
+}
 elf_symbol {
   id: 0xe7ef7059
   name: "__tracepoint_android_vh_rwsem_read_wait_finish"
@@ -342288,6 +342799,15 @@ elf_symbol {
   type_id: 0x18ccbd2c
   full_name: "__tracepoint_android_vh_rwsem_wake"
 }
+elf_symbol {
+  id: 0x878b3583
+  name: "__tracepoint_android_vh_rwsem_wake_finish"
+  is_defined: true
+  symbol_type: OBJECT
+  crc: 0x6b369940
+  type_id: 0x18ccbd2c
+  full_name: "__tracepoint_android_vh_rwsem_wake_finish"
+}
 elf_symbol {
   id: 0x1220ff14
   name: "__tracepoint_android_vh_rwsem_write_finished"
@@ -395681,6 +396201,10 @@ symbols {
     key: "__traceiter_android_vh_alter_futex_plist_add"
     value: 0x505f4289
   }
+  symbol {
+    key: "__traceiter_android_vh_alter_mutex_list_add"
+    value: 0xd5431a65
+  }
   symbol {
     key: "__traceiter_android_vh_alter_rwsem_list_add"
     value: 0xb288a9fe
@@ -395693,14 +396217,58 @@ symbols {
     key: "__traceiter_android_vh_audio_usb_offload_connect"
     value: 0x528da532
   }
+  symbol {
+    key: "__traceiter_android_vh_binder_free_proc"
+    value: 0xbebf7d98
+  }
+  symbol {
+    key: "__traceiter_android_vh_binder_has_work_ilocked"
+    value: 0x6935b08b
+  }
+  symbol {
+    key: "__traceiter_android_vh_binder_looper_state_registered"
+    value: 0xd595bd2c
+  }
+  symbol {
+    key: "__traceiter_android_vh_binder_preset"
+    value: 0xbff39e0e
+  }
+  symbol {
+    key: "__traceiter_android_vh_binder_priority_skip"
+    value: 0xae7d043c
+  }
+  symbol {
+    key: "__traceiter_android_vh_binder_proc_transaction_entry"
+    value: 0x8df3721b
+  }
+  symbol {
+    key: "__traceiter_android_vh_binder_proc_transaction_finish"
+    value: 0x20dbced6
+  }
+  symbol {
+    key: "__traceiter_android_vh_binder_read_done"
+    value: 0x5c1ee0c5
+  }
   symbol {
     key: "__traceiter_android_vh_binder_restore_priority"
     value: 0xc6c9353c
   }
+  symbol {
+    key: "__traceiter_android_vh_binder_select_worklist_ilocked"
+    value: 0xd738b678
+  }
   symbol {
     key: "__traceiter_android_vh_binder_set_priority"
     value: 0x2a9c6616
   }
+  symbol {
+    key: "__traceiter_android_vh_binder_thread_read"
+    value: 0x4785a3dd
+  }
+  symbol {
+    key: "__traceiter_android_vh_binder_thread_release"
+    value: 0x25f13dbe
+  }
   symbol {
     key: "__traceiter_android_vh_binder_transaction_init"
     value: 0x5cf60b10
@@ -395841,6 +396409,22 @@ symbols {
     key: "__traceiter_android_vh_map_util_freq"
     value: 0x61ea12b8
   }
+  symbol {
+    key: "__traceiter_android_vh_mutex_can_spin_on_owner"
+    value: 0xb1c564a3
+  }
+  symbol {
+    key: "__traceiter_android_vh_mutex_opt_spin_finish"
+    value: 0x17b175ff
+  }
+  symbol {
+    key: "__traceiter_android_vh_mutex_opt_spin_start"
+    value: 0x2a856841
+  }
+  symbol {
+    key: "__traceiter_android_vh_mutex_unlock_slowpath"
+    value: 0x0b2ba11b
+  }
   symbol {
     key: "__traceiter_android_vh_mutex_wait_finish"
     value: 0xe17999f4
@@ -395885,10 +396469,22 @@ symbols {
     key: "__traceiter_android_vh_rtmutex_wait_start"
     value: 0xfb1b8d64
   }
+  symbol {
+    key: "__traceiter_android_vh_rwsem_can_spin_on_owner"
+    value: 0x5858f827
+  }
   symbol {
     key: "__traceiter_android_vh_rwsem_init"
     value: 0xb1847a6f
   }
+  symbol {
+    key: "__traceiter_android_vh_rwsem_opt_spin_finish"
+    value: 0x958d8cdb
+  }
+  symbol {
+    key: "__traceiter_android_vh_rwsem_opt_spin_start"
+    value: 0xfde8086a
+  }
   symbol {
     key: "__traceiter_android_vh_rwsem_read_wait_finish"
     value: 0xbffefc2b
@@ -395901,6 +396497,10 @@ symbols {
     key: "__traceiter_android_vh_rwsem_wake"
     value: 0xf7bca936
   }
+  symbol {
+    key: "__traceiter_android_vh_rwsem_wake_finish"
+    value: 0x6fe41dd1
+  }
   symbol {
     key: "__traceiter_android_vh_rwsem_write_finished"
     value: 0x7945e8fa
@@ -396561,6 +397161,10 @@ symbols {
     key: "__tracepoint_android_vh_alter_futex_plist_add"
     value: 0xd82141b7
   }
+  symbol {
+    key: "__tracepoint_android_vh_alter_mutex_list_add"
+    value: 0xe520cb67
+  }
   symbol {
     key: "__tracepoint_android_vh_alter_rwsem_list_add"
     value: 0x8184b548
@@ -396573,14 +397177,58 @@ symbols {
     key: "__tracepoint_android_vh_audio_usb_offload_connect"
     value: 0xfb7cdd24
   }
+  symbol {
+    key: "__tracepoint_android_vh_binder_free_proc"
+    value: 0xf32898c6
+  }
+  symbol {
+    key: "__tracepoint_android_vh_binder_has_work_ilocked"
+    value: 0x332635cd
+  }
+  symbol {
+    key: "__tracepoint_android_vh_binder_looper_state_registered"
+    value: 0xf06625d6
+  }
+  symbol {
+    key: "__tracepoint_android_vh_binder_preset"
+    value: 0x95c75a1c
+  }
+  symbol {
+    key: "__tracepoint_android_vh_binder_priority_skip"
+    value: 0xe3a367fe
+  }
+  symbol {
+    key: "__tracepoint_android_vh_binder_proc_transaction_entry"
+    value: 0xb6cfb459
+  }
+  symbol {
+    key: "__tracepoint_android_vh_binder_proc_transaction_finish"
+    value: 0xc6a5dbd8
+  }
+  symbol {
+    key: "__tracepoint_android_vh_binder_read_done"
+    value: 0x54aac8cb
+  }
   symbol {
     key: "__tracepoint_android_vh_binder_restore_priority"
     value: 0x57a9a36a
   }
+  symbol {
+    key: "__tracepoint_android_vh_binder_select_worklist_ilocked"
+    value: 0x21d8d29a
+  }
   symbol {
     key: "__tracepoint_android_vh_binder_set_priority"
     value: 0x2e04cb9c
   }
+  symbol {
+    key: "__tracepoint_android_vh_binder_thread_read"
+    value: 0x306b5ff7
+  }
+  symbol {
+    key: "__tracepoint_android_vh_binder_thread_release"
+    value: 0x2fce8f78
+  }
   symbol {
     key: "__tracepoint_android_vh_binder_transaction_init"
     value: 0xa9d55136
@@ -396721,6 +397369,22 @@ symbols {
     key: "__tracepoint_android_vh_map_util_freq"
     value: 0x00a5fe5e
   }
+  symbol {
+    key: "__tracepoint_android_vh_mutex_can_spin_on_owner"
+    value: 0xd5097f8d
+  }
+  symbol {
+    key: "__tracepoint_android_vh_mutex_opt_spin_finish"
+    value: 0xecc3ea35
+  }
+  symbol {
+    key: "__tracepoint_android_vh_mutex_opt_spin_start"
+    value: 0x2122908b
+  }
+  symbol {
+    key: "__tracepoint_android_vh_mutex_unlock_slowpath"
+    value: 0x68d68809
+  }
   symbol {
     key: "__tracepoint_android_vh_mutex_wait_finish"
     value: 0x76e879b6
@@ -396765,10 +397429,22 @@ symbols {
     key: "__tracepoint_android_vh_rtmutex_wait_start"
     value: 0xf01f02ea
   }
+  symbol {
+    key: "__tracepoint_android_vh_rwsem_can_spin_on_owner"
+    value: 0xe471b8d5
+  }
   symbol {
     key: "__tracepoint_android_vh_rwsem_init"
     value: 0x84628825
   }
+  symbol {
+    key: "__tracepoint_android_vh_rwsem_opt_spin_finish"
+    value: 0x8d0ce77d
+  }
+  symbol {
+    key: "__tracepoint_android_vh_rwsem_opt_spin_start"
+    value: 0x50ab483c
+  }
   symbol {
     key: "__tracepoint_android_vh_rwsem_read_wait_finish"
     value: 0xe7ef7059
@@ -396781,6 +397457,10 @@ symbols {
     key: "__tracepoint_android_vh_rwsem_wake"
     value: 0x85a885d0
   }
+  symbol {
+    key: "__tracepoint_android_vh_rwsem_wake_finish"
+    value: 0x878b3583
+  }
   symbol {
     key: "__tracepoint_android_vh_rwsem_write_finished"
     value: 0x1220ff14
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index 590615dc5476..b1de098f7b22 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -78,6 +78,46 @@
   __tracepoint_android_vh_record_rtmutex_lock_starttime
   __tracepoint_android_vh_record_rwsem_lock_starttime
   __trace_puts
+  __traceiter_android_vh_alter_mutex_list_add
+  __traceiter_android_vh_binder_free_proc
+  __traceiter_android_vh_binder_has_work_ilocked
+  __traceiter_android_vh_binder_looper_state_registered
+  __traceiter_android_vh_binder_preset
+  __traceiter_android_vh_binder_priority_skip
+  __traceiter_android_vh_binder_proc_transaction_entry
+  __traceiter_android_vh_binder_proc_transaction_finish
+  __traceiter_android_vh_binder_read_done
+  __traceiter_android_vh_binder_select_worklist_ilocked
+  __traceiter_android_vh_binder_thread_read
+  __traceiter_android_vh_binder_thread_release
+  __traceiter_android_vh_mutex_can_spin_on_owner
+  __traceiter_android_vh_mutex_opt_spin_finish
+  __traceiter_android_vh_mutex_opt_spin_start
+  __traceiter_android_vh_mutex_unlock_slowpath
+  __traceiter_android_vh_rwsem_can_spin_on_owner
+  __traceiter_android_vh_rwsem_opt_spin_finish
+  __traceiter_android_vh_rwsem_opt_spin_start
+  __traceiter_android_vh_rwsem_wake_finish
+  __tracepoint_android_vh_alter_mutex_list_add
+  __tracepoint_android_vh_binder_free_proc
+  __tracepoint_android_vh_binder_has_work_ilocked
+  __tracepoint_android_vh_binder_looper_state_registered
+  __tracepoint_android_vh_binder_preset
+  __tracepoint_android_vh_binder_priority_skip
+  __tracepoint_android_vh_binder_proc_transaction_entry
+  __tracepoint_android_vh_binder_proc_transaction_finish
+  __tracepoint_android_vh_binder_read_done
+  __tracepoint_android_vh_binder_select_worklist_ilocked
+  __tracepoint_android_vh_binder_thread_read
+  __tracepoint_android_vh_binder_thread_release
+  __tracepoint_android_vh_mutex_can_spin_on_owner
+  __tracepoint_android_vh_mutex_opt_spin_finish
+  __tracepoint_android_vh_mutex_opt_spin_start
+  __tracepoint_android_vh_mutex_unlock_slowpath
+  __tracepoint_android_vh_rwsem_can_spin_on_owner
+  __tracepoint_android_vh_rwsem_opt_spin_finish
+  __tracepoint_android_vh_rwsem_opt_spin_start
+  __tracepoint_android_vh_rwsem_wake_finish
   typec_mux_get_drvdata
   unregister_memory_notifier
   unregister_tcf_proto_ops