diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 06d32f5e5e8f..4deecf08f816 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -277,24 +277,31 @@
+
+
+
+
+
+
+
@@ -305,6 +312,9 @@
+
+
+
@@ -312,6 +322,7 @@
+
@@ -325,9 +336,13 @@
+
+
+
+
@@ -344,6 +359,12 @@
+
+
+
+
+
+
@@ -352,6 +373,8 @@
+
+
@@ -366,6 +389,9 @@
+
+
+
@@ -374,6 +400,7 @@
+
@@ -5745,6 +5772,7 @@
+
@@ -5793,9 +5821,14 @@
+
+
+
+
+
@@ -5813,6 +5846,8 @@
+
+
@@ -5832,6 +5867,7 @@
+
@@ -10473,7 +10509,7 @@
-
+
@@ -25209,7 +25245,7 @@
-
+
@@ -27925,7 +27961,7 @@
-
+
@@ -35619,10 +35655,10 @@
-
+
-
+
@@ -38805,7 +38841,7 @@
-
+
@@ -41752,7 +41788,7 @@
-
+
@@ -58745,7 +58781,7 @@
-
+
@@ -67399,6 +67435,7 @@
+
@@ -73012,7 +73049,7 @@
-
+
@@ -73703,7 +73740,7 @@
-
+
@@ -74735,25 +74772,25 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -77863,7 +77900,7 @@
-
+
@@ -77890,7 +77927,7 @@
-
+
@@ -77904,7 +77941,7 @@
-
+
@@ -78789,7 +78826,7 @@
-
+
@@ -78802,7 +78839,7 @@
-
+
@@ -78832,7 +78869,7 @@
-
+
@@ -78875,7 +78912,7 @@
-
+
@@ -78902,7 +78939,7 @@
-
+
@@ -78910,7 +78947,7 @@
-
+
@@ -78918,7 +78955,7 @@
-
+
@@ -78936,25 +78973,25 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -78987,7 +79024,7 @@
-
+
@@ -78998,7 +79035,7 @@
-
+
@@ -79011,7 +79048,7 @@
-
+
@@ -79019,7 +79056,7 @@
-
+
@@ -79065,7 +79102,7 @@
-
+
@@ -79093,7 +79130,7 @@
-
+
@@ -79101,10 +79138,10 @@
-
+
-
+
@@ -79112,7 +79149,7 @@
-
+
@@ -79190,7 +79227,7 @@
-
+
@@ -79198,21 +79235,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -79252,13 +79289,13 @@
-
+
-
+
-
+
@@ -79274,7 +79311,7 @@
-
+
@@ -86432,9 +86469,6 @@
-
-
-
@@ -95398,9 +95432,6 @@
-
-
-
@@ -97156,7 +97187,14 @@
-
+
+
+
+
+
+
+
+
@@ -103259,7 +103297,7 @@
-
+
@@ -104335,7 +104373,7 @@
-
+
@@ -107865,7 +107903,7 @@
-
+
@@ -109006,7 +109044,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -109014,7 +109063,7 @@
-
+
@@ -109022,7 +109071,7 @@
-
+
@@ -109033,7 +109082,7 @@
-
+
@@ -109041,7 +109090,7 @@
-
+
@@ -109058,7 +109107,7 @@
-
+
@@ -109066,7 +109115,7 @@
-
+
@@ -109074,7 +109123,7 @@
-
+
@@ -109088,7 +109137,7 @@
-
+
@@ -109102,7 +109151,7 @@
-
+
@@ -109119,7 +109168,7 @@
-
+
@@ -109133,7 +109182,7 @@
-
+
@@ -109150,7 +109199,7 @@
-
+
@@ -109161,7 +109210,7 @@
-
+
@@ -109178,7 +109227,7 @@
-
+
@@ -109186,7 +109235,7 @@
-
+
@@ -109197,7 +109246,7 @@
-
+
@@ -109208,7 +109257,7 @@
-
+
@@ -109222,7 +109271,7 @@
-
+
@@ -109230,7 +109279,7 @@
-
+
@@ -109403,13 +109452,13 @@
-
+
-
+
@@ -109420,7 +109469,7 @@
-
+
@@ -109431,7 +109480,7 @@
-
+
@@ -109439,7 +109488,7 @@
-
+
@@ -109447,7 +109496,7 @@
-
+
@@ -109461,7 +109510,7 @@
-
+
@@ -109469,7 +109518,7 @@
-
+
@@ -109477,7 +109526,7 @@
-
+
@@ -109485,7 +109534,7 @@
-
+
@@ -109493,7 +109542,7 @@
-
+
@@ -109504,7 +109553,7 @@
-
+
@@ -109512,7 +109561,7 @@
-
+
@@ -109526,7 +109575,7 @@
-
+
@@ -109540,7 +109589,7 @@
-
+
@@ -109560,7 +109609,7 @@
-
+
@@ -109571,7 +109620,7 @@
-
+
@@ -109579,7 +109628,7 @@
-
+
@@ -109587,7 +109636,7 @@
-
+
@@ -109595,7 +109644,7 @@
-
+
@@ -109615,7 +109664,7 @@
-
+
@@ -109629,7 +109678,7 @@
-
+
@@ -109646,7 +109695,7 @@
-
+
@@ -109660,7 +109709,7 @@
-
+
@@ -109674,7 +109723,7 @@
-
+
@@ -109682,7 +109731,7 @@
-
+
@@ -109696,7 +109745,7 @@
-
+
@@ -109707,7 +109756,7 @@
-
+
@@ -109724,7 +109773,7 @@
-
+
@@ -109732,7 +109781,7 @@
-
+
@@ -109740,7 +109789,7 @@
-
+
@@ -109751,7 +109800,7 @@
-
+
@@ -109762,7 +109811,7 @@
-
+
@@ -109770,7 +109819,7 @@
-
+
@@ -109778,7 +109827,7 @@
-
+
@@ -109795,7 +109844,7 @@
-
+
@@ -109818,7 +109867,7 @@
-
+
@@ -109826,7 +109875,7 @@
-
+
@@ -109834,17 +109883,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -111608,20 +111646,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -121272,7 +121297,7 @@
-
+
@@ -123344,6 +123369,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -123351,6 +123390,11 @@
+
+
+
+
+
@@ -123377,6 +123421,11 @@
+
+
+
+
+
@@ -123406,6 +123455,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -123426,6 +123485,15 @@
+
+
+
+
+
+
+
+
+
@@ -123465,6 +123533,15 @@
+
+
+
+
+
+
+
+
+
@@ -123527,6 +123604,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -123572,6 +123664,15 @@
+
+
+
+
+
+
+
+
+
@@ -123654,6 +123755,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -123669,6 +123780,13 @@
+
+
+
+
+
+
+
@@ -123677,6 +123795,11 @@
+
+
+
+
+
@@ -123784,6 +123907,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -123840,6 +124004,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -123920,6 +124096,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -123973,6 +124164,11 @@
+
+
+
+
+
@@ -124239,6 +124435,7 @@
+
@@ -124287,9 +124484,14 @@
+
+
+
+
+
@@ -124307,6 +124509,8 @@
+
+
@@ -124326,6 +124530,7 @@
+
diff --git a/android/abi_gki_aarch64_unisoc b/android/abi_gki_aarch64_unisoc
index 8dc72f534da0..adfffbb5bca1 100644
--- a/android/abi_gki_aarch64_unisoc
+++ b/android/abi_gki_aarch64_unisoc
@@ -5,6 +5,7 @@
add_wait_queue
add_to_page_cache_lru
addrconf_prefix_rcv_add_addr
+ activate_task
aes_encrypt
aes_expandkey
alloc_anon_inode
@@ -19,6 +20,7 @@
alloc_workqueue
__arch_copy_from_user
__arch_copy_to_user
+ arch_freq_scale
arch_timer_read_counter
arm64_const_caps_ready
arm64_use_ng_mappings
@@ -26,6 +28,8 @@
atomic_notifier_call_chain
atomic_notifier_chain_register
atomic_notifier_chain_unregister
+ available_idle_cpu
+ balance_push_callback
bio_add_page
bio_alloc_bioset
bio_associate_blkg
@@ -73,6 +77,7 @@
cdev_init
__cfi_slowpath_diag
__check_object_size
+ check_preempt_curr
__class_create
class_destroy
class_find_device
@@ -113,14 +118,19 @@
cpu_hwcap_keys
cpu_hwcaps
cpumask_next
+ cpumask_next_and
cpufreq_add_update_util_hook
cpufreq_cpu_get
cpufreq_cpu_put
cpufreq_quick_get_max
cpufreq_remove_update_util_hook
+ cpupri_find_fitness
cpu_number
+ cpu_scale
+ __cpu_active_mask
__cpu_online_mask
__cpu_possible_mask
+ __cpu_present_mask
crypto_alloc_base
crypto_ahash_digest
crypto_ahash_setkey
@@ -143,6 +153,7 @@
__dynamic_netdev_dbg
d_make_root
d_splice_alias
+ deactivate_task
debugfs_create_bool
debugfs_create_dir
debugfs_create_file
@@ -251,6 +262,7 @@
dma_sync_single_for_cpu
dma_sync_single_for_device
dma_unmap_sg_attrs
+ double_rq_lock
down
dput
driver_register
@@ -403,6 +415,7 @@
init_wait_entry
init_pseudo
init_special_inode
+ init_task
__init_waitqueue_head
inc_zone_page_state
inode_init_once
@@ -498,6 +511,7 @@
kmemdup
kobject_create_and_add
kobject_uevent_env
+ ksoftirqd
kstrndup
kstrtou16
kstrtobool
@@ -537,6 +551,7 @@
mii_ethtool_gset
mii_nway_restart
mii_link_ok
+ migrate_swap
misc_deregister
misc_register
mod_node_page_state
@@ -687,9 +702,11 @@
preempt_schedule_notrace
prepare_to_wait_event
_printk
+ _printk_deferred
proc_create
proc_create_data
proc_create_seq_private
+ proc_dointvec_minmax
proc_mkdir
__pskb_copy_fclone
pskb_expand_head
@@ -717,6 +734,8 @@
radix_tree_gang_lookup
radix_tree_insert
radix_tree_lookup
+ raw_spin_rq_lock_nested
+ raw_spin_rq_unlock
rc_map_unregister
rc_repeat
rc_keydown
@@ -731,6 +750,7 @@
register_filesystem
register_pernet_subsys
register_pm_notifier
+ register_sysctl_table
regmap_exit
regmap_read
regmap_update_bits_base
@@ -761,14 +781,17 @@
rfkill_init_sw_state
rfkill_register
rfkill_unregister
+ runqueues
__SetPageMovable
sched_clock
sched_set_fifo_low
sched_setscheduler
+ sched_uclamp_used
schedule
schedule_timeout
schedule_timeout_interruptible
scnprintf
+ seq_buf_printf
seq_lseek
seq_printf
seq_putc
@@ -840,7 +863,11 @@
spi_setup
sprintf
sscanf
+ static_key_disable
__stack_chk_fail
+ stop_machine
+ stop_one_cpu
+ stop_one_cpu_nowait
strcasecmp
strcat
strchr
@@ -863,6 +890,8 @@
synchronize_irq
syscon_regmap_lookup_by_phandle
syscon_regmap_lookup_by_phandle_args
+ sysctl_sched_features
+ sysctl_vals
sysfs_create_bin_file
sysfs_create_file_ns
sysfs_create_group
@@ -883,11 +912,17 @@
sys_tz
tasklet_init
tasklet_kill
+ tasklist_lock
+ task_may_not_preempt
__tasklet_schedule
+ thermal_pressure
thermal_zone_device_disable
thermal_zone_device_enable
thermal_zone_get_zone_by_name
timer_of_init
+ topology_clear_scale_freq_source
+ topology_set_thermal_pressure
+ topology_update_done
trace_define_field
trace_event_buffer_commit
trace_event_buffer_reserve
@@ -923,6 +958,7 @@
__ubsan_handle_cfi_check_fail_abort
__udelay
__unregister_chrdev
+ uclamp_eff_value
unlock_new_inode
unlock_page
unregister_blkdev
@@ -930,6 +966,7 @@
unregister_chrdev_region
unregister_pernet_subsys
up
+ update_rq_clock
usb_add_gadget_udc
usb_alloc_coherent
usb_alloc_urb
@@ -1042,6 +1079,132 @@
xt_unregister_matches
xt_unregister_target
xt_unregister_targets
+ __traceiter_android_rvh_account_irq
+ __traceiter_android_rvh_after_dequeue_task
+ __traceiter_android_rvh_after_enqueue_task
+ __traceiter_android_rvh_build_perf_domains
+ __traceiter_android_rvh_can_migrate_task
+ __traceiter_android_rvh_check_preempt_wakeup
+ __traceiter_android_rvh_cpu_cgroup_attach
+ __traceiter_android_rvh_cpu_cgroup_can_attach
+ __traceiter_android_rvh_cpu_cgroup_online
+ __traceiter_android_rvh_cpu_overutilized
+ __traceiter_android_rvh_dequeue_task
+ __traceiter_android_rvh_effective_cpu_util
+ __traceiter_android_rvh_enqueue_task
+ __traceiter_android_rvh_find_busiest_group
+ __traceiter_android_rvh_find_busiest_queue
+ __traceiter_android_rvh_find_energy_efficient_cpu
+ __traceiter_android_rvh_find_lowest_rq
+ __traceiter_android_rvh_find_new_ilb
+ __traceiter_android_rvh_finish_prio_fork
+ __traceiter_android_rvh_migrate_queued_task
+ __traceiter_android_rvh_new_task_stats
+ __traceiter_android_rvh_prepare_prio_fork
+ __traceiter_android_rvh_rtmutex_prepare_setprio
+ __traceiter_android_rvh_sched_cpu_dying
+ __traceiter_android_rvh_sched_cpu_starting
+ __traceiter_android_rvh_sched_exec
+ __traceiter_android_rvh_sched_fork_init
+ __traceiter_android_rvh_sched_newidle_balance
+ __traceiter_android_rvh_sched_nohz_balancer_kick
+ __traceiter_android_rvh_schedule
+ __traceiter_android_rvh_select_fallback_rq
+ __traceiter_android_rvh_select_task_rq_dl
+ __traceiter_android_rvh_select_task_rq_fair
+ __traceiter_android_rvh_select_task_rq_rt
+ __traceiter_android_rvh_setscheduler
+ __traceiter_android_rvh_set_task_cpu
+ __traceiter_android_rvh_set_user_nice
+ __traceiter_android_rvh_tick_entry
+ __traceiter_android_rvh_try_to_wake_up
+ __traceiter_android_rvh_try_to_wake_up_success
+ __traceiter_android_rvh_update_cpu_capacity
+ __traceiter_android_rvh_update_misfit_status
+ __traceiter_android_rvh_wake_up_new_task
+ __traceiter_android_vh_arch_set_freq_scale
+ __traceiter_android_vh_binder_restore_priority
+ __traceiter_android_vh_binder_set_priority
+ __traceiter_android_vh_binder_transaction_init
+ __traceiter_android_vh_cpufreq_resolve_freq
+ __traceiter_android_vh_cpufreq_fast_switch
+ __traceiter_android_vh_cpufreq_target
+ __traceiter_android_vh_dump_throttled_rt_tasks
+ __traceiter_android_vh_enable_thermal_power_throttle
+ __traceiter_android_vh_get_thermal_zone_device
+ __traceiter_android_vh_ipi_stop
+ __traceiter_android_vh_modify_thermal_request_freq
+ __traceiter_android_vh_modify_thermal_target_freq
+ __traceiter_android_vh_scheduler_tick
+ __traceiter_android_vh_set_wake_flags
+ __traceiter_android_vh_thermal_power_cap
+ __traceiter_android_vh_thermal_register
+ __traceiter_android_vh_thermal_unregister
+ __traceiter_android_vh_update_topology_flags_workfn
+ __traceiter_pelt_se_tp
+ __tracepoint_android_rvh_account_irq
+ __tracepoint_android_rvh_after_dequeue_task
+ __tracepoint_android_rvh_after_enqueue_task
+ __tracepoint_android_rvh_build_perf_domains
+ __tracepoint_android_rvh_can_migrate_task
+ __tracepoint_android_rvh_check_preempt_wakeup
+ __tracepoint_android_rvh_cpu_cgroup_attach
+ __tracepoint_android_rvh_cpu_cgroup_can_attach
+ __tracepoint_android_rvh_cpu_cgroup_online
+ __tracepoint_android_rvh_cpu_overutilized
+ __tracepoint_android_rvh_dequeue_task
+ __tracepoint_android_rvh_effective_cpu_util
+ __tracepoint_android_rvh_enqueue_task
+ __tracepoint_android_rvh_find_busiest_group
+ __tracepoint_android_rvh_find_busiest_queue
+ __tracepoint_android_rvh_find_energy_efficient_cpu
+ __tracepoint_android_rvh_find_lowest_rq
+ __tracepoint_android_rvh_find_new_ilb
+ __tracepoint_android_rvh_finish_prio_fork
+ __tracepoint_android_rvh_migrate_queued_task
+ __tracepoint_android_rvh_new_task_stats
+ __tracepoint_android_rvh_prepare_prio_fork
+ __tracepoint_android_rvh_rtmutex_prepare_setprio
+ __tracepoint_android_rvh_sched_cpu_dying
+ __tracepoint_android_rvh_sched_cpu_starting
+ __tracepoint_android_rvh_sched_exec
+ __tracepoint_android_rvh_sched_fork_init
+ __tracepoint_android_rvh_sched_newidle_balance
+ __tracepoint_android_rvh_sched_nohz_balancer_kick
+ __tracepoint_android_rvh_schedule
+ __tracepoint_android_rvh_select_fallback_rq
+ __tracepoint_android_rvh_select_task_rq_dl
+ __tracepoint_android_rvh_select_task_rq_fair
+ __tracepoint_android_rvh_select_task_rq_rt
+ __tracepoint_android_rvh_setscheduler
+ __tracepoint_android_rvh_set_task_cpu
+ __tracepoint_android_rvh_set_user_nice
+ __tracepoint_android_rvh_tick_entry
+ __tracepoint_android_rvh_try_to_wake_up
+ __tracepoint_android_rvh_try_to_wake_up_success
+ __tracepoint_android_rvh_update_cpu_capacity
+ __tracepoint_android_rvh_update_misfit_status
+ __tracepoint_android_rvh_wake_up_new_task
+ __tracepoint_android_vh_arch_set_freq_scale
+ __tracepoint_android_vh_binder_restore_priority
+ __tracepoint_android_vh_binder_set_priority
+ __tracepoint_android_vh_binder_transaction_init
+ __tracepoint_android_vh_cpufreq_resolve_freq
+ __tracepoint_android_vh_cpufreq_fast_switch
+ __tracepoint_android_vh_cpufreq_target
+ __tracepoint_android_vh_dump_throttled_rt_tasks
+ __tracepoint_android_vh_enable_thermal_power_throttle
+ __tracepoint_android_vh_get_thermal_zone_device
+ __tracepoint_android_vh_ipi_stop
+ __tracepoint_android_vh_modify_thermal_request_freq
+ __tracepoint_android_vh_modify_thermal_target_freq
+ __tracepoint_android_vh_scheduler_tick
+ __tracepoint_android_vh_set_wake_flags
+ __tracepoint_android_vh_thermal_power_cap
+ __tracepoint_android_vh_thermal_register
+ __tracepoint_android_vh_thermal_unregister
+ __tracepoint_android_vh_update_topology_flags_workfn
+ __tracepoint_pelt_se_tp
# required by blk-mq-virtio.ko
blk_mq_map_queues
@@ -1307,16 +1470,12 @@
system_highpri_wq
tracepoint_probe_register
__tracepoint_android_vh_dma_buf_release
- __tracepoint_android_vh_get_thermal_zone_device
__tracepoint_android_vh_psci_tos_resident_on
__tracepoint_android_vh_psci_cpu_suspend
__tracepoint_android_vh_regmap_update
- __tracepoint_android_vh_thermal_register
- __tracepoint_android_vh_thermal_unregister
__tracepoint_android_vh_usb_new_device_added
__traceiter_android_rvh_tk_based_time_sync
__traceiter_android_rvh_report_bug
- __tracepoint_android_rvh_effective_cpu_util
__tracepoint_android_rvh_report_bug
__tracepoint_clock_set_rate
__tracepoint_android_rvh_tk_based_time_sync