diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index d1da8c9bc15e..df919dfae0d3 100755
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -332,17 +332,22 @@
+
+
+
+
+
@@ -383,6 +388,9 @@
+
+
+
@@ -394,6 +402,7 @@
+
@@ -418,6 +427,7 @@
+
@@ -3414,6 +3424,7 @@
+
@@ -3784,6 +3795,7 @@
+
@@ -5114,12 +5126,15 @@
+
+
+
@@ -5167,6 +5182,9 @@
+
+
+
@@ -5182,6 +5200,7 @@
+
@@ -5207,6 +5226,7 @@
+
@@ -10109,6 +10129,9 @@
+
+
+
@@ -17292,6 +17315,7 @@
+
@@ -20907,6 +20931,7 @@
+
@@ -26997,6 +27022,7 @@
+
@@ -31715,6 +31741,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -33969,6 +34006,14 @@
+
+
+
+
+
+
+
+
@@ -50461,6 +50506,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -54890,7 +55017,7 @@
-
+
@@ -65850,6 +65977,7 @@
+
@@ -67268,6 +67396,7 @@
+
@@ -71042,6 +71171,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -100614,6 +100769,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -106408,6 +106595,7 @@
+
@@ -110337,6 +110525,14 @@
+
+
+
+
+
+
+
+
@@ -110369,6 +110565,13 @@
+
+
+
+
+
+
+
@@ -110376,6 +110579,11 @@
+
+
+
+
+
@@ -110408,6 +110616,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -110654,6 +110874,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -110723,6 +110958,11 @@
+
+
+
+
+
@@ -110864,6 +111104,12 @@
+
+
+
+
+
+
@@ -111379,12 +111625,15 @@
+
+
+
@@ -111432,6 +111681,9 @@
+
+
+
@@ -111447,6 +111699,7 @@
+
@@ -111472,6 +111725,7 @@
+
@@ -126767,6 +127021,11 @@
+
+
+
+
+
@@ -128564,6 +128823,11 @@
+
+
+
+
+
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index a6fe4bb93126..8a16c1d45a1c 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -69,9 +69,9 @@
blocking_notifier_call_chain
blocking_notifier_chain_register
blocking_notifier_chain_unregister
- bpf_trace_run1
bpf_trace_run10
bpf_trace_run12
+ bpf_trace_run1
bpf_trace_run2
bpf_trace_run3
bpf_trace_run4
@@ -231,6 +231,7 @@
crc8
crc8_populate_msb
crypto_alloc_base
+ crypto_alloc_shash
crypto_comp_compress
crypto_comp_decompress
crypto_destroy_tfm
@@ -238,6 +239,7 @@
crypto_register_alg
crypto_register_rngs
crypto_register_scomp
+ crypto_shash_digest
crypto_unregister_alg
crypto_unregister_rngs
crypto_unregister_scomp
@@ -682,6 +684,7 @@
idr_replace
iio_channel_get
iio_channel_get_all
+ iio_channel_release
iio_read_channel_processed
import_iovec
inc_node_page_state
@@ -939,8 +942,8 @@
mempool_free
mempool_free_slab
memremap
- memset
memset64
+ memset
__memset_io
memstart_addr
memunmap
@@ -976,8 +979,8 @@
netlink_unicast
nla_find
nla_put
- nla_reserve
nla_reserve_64bit
+ nla_reserve
__nla_validate
__nlmsg_put
no_llseek
@@ -1237,9 +1240,11 @@
proc_douintvec_minmax
proc_mkdir
proc_remove
+ proc_symlink
proto_register
proto_unregister
__pskb_pull_tail
+ public_key_verify_signature
putback_movable_pages
put_device
put_disk
@@ -1464,6 +1469,7 @@
sdhci_pltfm_free
sdhci_pltfm_init
sdhci_remove_host
+ sdhci_request
sdhci_reset
sdhci_set_bus_width
sdhci_set_power_noreg
@@ -1504,6 +1510,7 @@
simple_attr_release
simple_open
simple_read_from_buffer
+ simple_strtol
simple_strtoul
simple_write_to_buffer
single_open
@@ -1616,6 +1623,7 @@
syscon_node_to_regmap
syscon_regmap_lookup_by_phandle
sysctl_sched_features
+ sysctl_sched_latency
sysctl_vals
sysfs_add_file_to_group
sysfs_add_link_to_group
@@ -1651,6 +1659,7 @@
task_may_not_preempt
__task_pid_nr_ns
__task_rq_lock
+ task_rq_lock
thermal_cooling_device_register
thermal_cooling_device_unregister
thermal_of_cooling_device_register
@@ -1694,6 +1703,8 @@
__traceiter_android_rvh_gic_v3_set_affinity
__traceiter_android_rvh_migrate_queued_task
__traceiter_android_rvh_new_task_stats
+ __traceiter_android_rvh_pick_next_entity
+ __traceiter_android_rvh_place_entity
__traceiter_android_rvh_replace_next_task_fair
__traceiter_android_rvh_resume_cpus
__traceiter_android_rvh_sched_cpu_dying
@@ -1720,9 +1731,15 @@
__traceiter_android_rvh_update_misfit_status
__traceiter_android_rvh_wake_up_new_task
__traceiter_android_vh_allow_domain_state
+ __traceiter_android_vh_alter_mutex_list_add
+ __traceiter_android_vh_alter_rwsem_list_add
__traceiter_android_vh_binder_restore_priority
__traceiter_android_vh_binder_set_priority
+ __traceiter_android_vh_binder_wait_for_work
__traceiter_android_vh_binder_wakeup_ilocked
+ __traceiter_android_vh_build_sched_domains
+ __traceiter_android_vh_check_uninterruptible_tasks
+ __traceiter_android_vh_check_uninterruptible_tasks_dn
__traceiter_android_vh_cpu_idle_enter
__traceiter_android_vh_cpu_idle_exit
__traceiter_android_vh_ftrace_dump_buffer
@@ -1735,11 +1752,17 @@
__traceiter_android_vh_ipi_stop
__traceiter_android_vh_jiffies_update
__traceiter_android_vh_logbuf
+ __traceiter_android_vh_mutex_unlock_slowpath
+ __traceiter_android_vh_mutex_wait_finish
+ __traceiter_android_vh_mutex_wait_start
__traceiter_android_vh_printk_hotplug
+ __traceiter_android_vh_rwsem_wake
+ __traceiter_android_vh_rwsem_wake_finish
__traceiter_android_vh_scheduler_tick
__traceiter_android_vh_show_max_freq
__traceiter_android_vh_show_resume_epoch_val
__traceiter_android_vh_show_suspend_epoch_val
+ __traceiter_android_vh_sync_txn_recvd
__traceiter_android_vh_timer_calc_index
__traceiter_android_vh_update_topology_flags_workfn
__traceiter_binder_transaction_received
@@ -1770,6 +1793,8 @@
__tracepoint_android_rvh_gic_v3_set_affinity
__tracepoint_android_rvh_migrate_queued_task
__tracepoint_android_rvh_new_task_stats
+ __tracepoint_android_rvh_pick_next_entity
+ __tracepoint_android_rvh_place_entity
__tracepoint_android_rvh_replace_next_task_fair
__tracepoint_android_rvh_resume_cpus
__tracepoint_android_rvh_sched_cpu_dying
@@ -1796,9 +1821,13 @@
__tracepoint_android_rvh_update_misfit_status
__tracepoint_android_rvh_wake_up_new_task
__tracepoint_android_vh_allow_domain_state
+ __tracepoint_android_vh_alter_mutex_list_add
+ __tracepoint_android_vh_alter_rwsem_list_add
__tracepoint_android_vh_binder_restore_priority
__tracepoint_android_vh_binder_set_priority
+ __tracepoint_android_vh_binder_wait_for_work
__tracepoint_android_vh_binder_wakeup_ilocked
+ __tracepoint_android_vh_build_sched_domains
__tracepoint_android_vh_check_uninterruptible_tasks
__tracepoint_android_vh_check_uninterruptible_tasks_dn
__tracepoint_android_vh_cpu_idle_enter
@@ -1813,11 +1842,17 @@
__tracepoint_android_vh_ipi_stop
__tracepoint_android_vh_jiffies_update
__tracepoint_android_vh_logbuf
+ __tracepoint_android_vh_mutex_unlock_slowpath
+ __tracepoint_android_vh_mutex_wait_finish
+ __tracepoint_android_vh_mutex_wait_start
__tracepoint_android_vh_printk_hotplug
+ __tracepoint_android_vh_rwsem_wake
+ __tracepoint_android_vh_rwsem_wake_finish
__tracepoint_android_vh_scheduler_tick
__tracepoint_android_vh_show_max_freq
__tracepoint_android_vh_show_resume_epoch_val
__tracepoint_android_vh_show_suspend_epoch_val
+ __tracepoint_android_vh_sync_txn_recvd
__tracepoint_android_vh_timer_calc_index
__tracepoint_android_vh_update_topology_flags_workfn
__tracepoint_binder_transaction_received