diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index f68528f3205c..d7eacb49c736 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -106,6 +106,7 @@
+
@@ -155,6 +156,7 @@
+
@@ -395,6 +397,7 @@
+
@@ -2925,6 +2928,7 @@
+
@@ -3825,6 +3829,9 @@
+
+
+
@@ -5898,6 +5905,7 @@
+
@@ -5970,6 +5978,7 @@
+
@@ -23674,6 +23683,7 @@
+
@@ -26388,6 +26398,7 @@
+
@@ -122356,6 +122367,11 @@
+
+
+
+
+
@@ -122664,6 +122680,12 @@
+
+
+
+
+
+
@@ -124126,6 +124148,11 @@
+
+
+
+
+
@@ -124569,6 +124596,7 @@
+
@@ -127266,6 +127294,7 @@
+
@@ -137875,6 +137904,10 @@
+
+
+
+
@@ -142430,6 +142463,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -152306,7 +152355,6 @@
-
diff --git a/android/abi_gki_aarch64_pixel b/android/abi_gki_aarch64_pixel
index efecd684f87f..c09dcd2f83eb 100644
--- a/android/abi_gki_aarch64_pixel
+++ b/android/abi_gki_aarch64_pixel
@@ -26,6 +26,8 @@
__arch_copy_from_user
__arch_copy_to_user
arch_timer_read_counter
+ argv_free
+ argv_split
arm64_const_caps_ready
arm64_use_ng_mappings
__arm_smccc_smc
@@ -36,10 +38,12 @@
atomic_notifier_chain_unregister
autoremove_wake_function
available_idle_cpu
+ backlight_device_set_brightness
balance_push_callback
bcmp
bin2hex
__bitmap_clear
+ __bitmap_equal
bitmap_from_arr32
bitmap_parse
bitmap_parselist
@@ -66,6 +70,7 @@
bpf_trace_run6
bpf_trace_run7
bpf_trace_run8
+ bpf_trace_run9
build_skb
bus_find_device
bus_for_each_dev
@@ -162,6 +167,7 @@
component_unbind_all
config_ep_by_speed
config_group_init_type_name
+ console_set_on_cmdline
console_suspend_enabled
console_trylock
console_unlock
@@ -264,6 +270,7 @@
dev_driver_string
_dev_emerg
_dev_err
+ dev_err_probe
devfreq_add_device
devfreq_add_governor
devfreq_monitor_resume
@@ -387,6 +394,7 @@
dev_pm_opp_set_regulators
dev_pm_qos_read_value
dev_pm_qos_update_request
+ _dev_printk
dev_printk_emit
dev_queue_xmit
devres_add
@@ -430,6 +438,7 @@
dma_fence_remove_callback
dma_fence_signal
dma_fence_signal_locked
+ dma_fence_wait_timeout
dma_free_attrs
dma_get_slave_caps
dma_get_slave_channel
@@ -464,6 +473,7 @@
downgrade_write
down_interruptible
down_read
+ down_read_trylock
down_trylock
down_write
drain_workqueue
@@ -619,10 +629,12 @@
drm_plane_create_alpha_property
drm_plane_create_blend_mode_property
drm_plane_create_rotation_property
+ drm_plane_create_zpos_immutable_property
drm_plane_create_zpos_property
drm_poll
drm_prime_gem_destroy
drm_printf
+ __drm_printfn_debug
__drm_printfn_info
__drm_printfn_seq_file
drm_property_blob_get
@@ -633,6 +645,7 @@
drm_property_create_bool
drm_property_create_enum
drm_property_create_range
+ drm_property_create_signed_range
drm_property_lookup_blob
drm_property_replace_blob
__drm_puts_seq_file
@@ -658,6 +671,7 @@
dw_pcie_write
__dynamic_dev_dbg
__dynamic_pr_debug
+ em_cpu_get
emergency_restart
enable_irq
enable_percpu_irq
@@ -683,6 +697,7 @@
_find_first_zero_bit
find_get_pid
_find_next_bit
+ find_pid_ns
find_task_by_vpid
__find_vma
finish_wait
@@ -832,6 +847,7 @@
inc_zone_page_state
init_dummy_netdev
init_net
+ init_pid_ns
init_pseudo
__init_rwsem
__init_swait_queue_head
@@ -934,6 +950,7 @@
__kfifo_in
__kfifo_init
__kfifo_out
+ __kfifo_out_peek
kfree
kfree_sensitive
kfree_skb
@@ -972,6 +989,7 @@
kstrtos8
kstrtou16
kstrtou8
+ kstrtou8_from_user
kstrtouint
kstrtouint_from_user
kstrtoull
@@ -998,6 +1016,7 @@
ktime_get_raw_ts64
ktime_get_real_seconds
ktime_get_real_ts64
+ ktime_get_snapshot
ktime_get_ts64
ktime_get_with_offset
kvfree
@@ -1027,6 +1046,7 @@
memdup_user
memdup_user_nul
memmove
+ memparse
memremap
mem_section
memset
@@ -1113,13 +1133,16 @@
of_clk_src_onecell_get
of_count_phandle_with_args
of_cpu_node_to_id
+ of_devfreq_cooling_register_power
of_device_get_match_data
of_device_is_available
of_device_is_compatible
of_dma_controller_free
of_dma_controller_register
+ of_dma_is_coherent
of_drm_find_bridge
of_drm_find_panel
+ of_find_backlight_by_node
of_find_compatible_node
of_find_device_by_node
of_find_i2c_adapter_by_node
@@ -1222,6 +1245,7 @@
PDE_DATA
__per_cpu_offset
perf_event_create_kernel_counter
+ perf_event_disable
perf_event_enable
perf_event_pause
perf_event_read_local
@@ -1252,6 +1276,11 @@
pin_user_pages_fast
pin_user_pages_remote
pktgen_xfrm_outer_mode_output
+ pkvm_iommu_finalize
+ pkvm_iommu_resume
+ pkvm_iommu_s2mpu_register
+ pkvm_iommu_suspend
+ pkvm_iommu_sysmmu_sync_register
platform_bus_type
platform_device_add
platform_device_add_data
@@ -1304,6 +1333,9 @@
power_supply_set_property
power_supply_unregister
power_supply_unreg_notifier
+ pps_event
+ pps_register_source
+ pps_unregister_source
prandom_u32
preempt_schedule
preempt_schedule_notrace
@@ -1428,6 +1460,8 @@
regulator_set_voltage_sel_regmap
regulator_unregister
regulatory_hint
+ regulatory_set_wiphy_regd
+ regulatory_set_wiphy_regd_sync
release_firmware
__release_region
remap_pfn_range
@@ -1521,6 +1555,7 @@
sg_next
__sg_page_iter_next
__sg_page_iter_start
+ shmem_file_setup
simple_attr_open
simple_attr_read
simple_attr_release
@@ -1548,6 +1583,7 @@
skb_queue_tail
skb_realloc_headroom
skb_trim
+ skip_spaces
smp_call_function
smp_call_function_single
smp_call_on_cpu
@@ -1630,6 +1666,7 @@
spi_sync
spi_sync_locked
spi_unregister_controller
+ split_page
sprintf
sprint_symbol
srcu_init_notifier_head
@@ -1696,13 +1733,16 @@
sysrq_mask
system_freezing_cnt
system_highpri_wq
+ system_long_wq
system_state
system_unbound_wq
system_wq
sys_tz
+ task_active_pid_ns
tasklet_init
tasklet_kill
__tasklet_schedule
+ tasklet_unlock_wait
task_may_not_preempt
__task_pid_nr_ns
task_rq_lock
@@ -1727,6 +1767,7 @@
thermal_zone_device_register
thermal_zone_device_unregister
thermal_zone_device_update
+ thermal_zone_get_temp
thermal_zone_of_sensor_register
thermal_zone_of_sensor_unregister
thread_group_cputime_adjusted
@@ -1761,7 +1802,9 @@
__traceiter_android_vh_cpu_idle_enter
__traceiter_android_vh_cpu_idle_exit
__traceiter_android_vh_ipi_stop
+ __traceiter_android_vh_scheduler_tick
__traceiter_android_vh_setscheduler_uclamp
+ __traceiter_android_vh_sysrq_crash
__traceiter_android_vh_ufs_check_int_errors
__traceiter_android_vh_ufs_compl_command
__traceiter_android_vh_ufs_fill_prdt
@@ -1806,7 +1849,9 @@
__tracepoint_android_vh_cpu_idle_enter
__tracepoint_android_vh_cpu_idle_exit
__tracepoint_android_vh_ipi_stop
+ __tracepoint_android_vh_scheduler_tick
__tracepoint_android_vh_setscheduler_uclamp
+ __tracepoint_android_vh_sysrq_crash
__tracepoint_android_vh_ufs_check_int_errors
__tracepoint_android_vh_ufs_compl_command
__tracepoint_android_vh_ufs_fill_prdt
@@ -1962,6 +2007,9 @@
v4l2_m2m_release
vabits_actual
vb2_buffer_done
+ vb2_common_vm_ops
+ vb2_create_framevec
+ vb2_destroy_framevec
vb2_dma_sg_memops
vb2_dqbuf
vb2_fop_mmap
@@ -2008,9 +2056,13 @@
virtqueue_kick_prepare
virtqueue_notify
vmalloc
+ vmalloc_to_page
vmalloc_user
vmap
vmf_insert_pfn_prot
+ vm_map_pages
+ vm_map_ram
+ vm_unmap_ram
vprintk
vring_del_virtqueue
vring_interrupt
@@ -2020,6 +2072,7 @@
vzalloc
vzalloc_node
wait_for_completion
+ wait_for_completion_interruptible
wait_for_completion_interruptible_timeout
wait_for_completion_timeout
wait_woken
@@ -2052,23 +2105,3 @@
xhci_resume
xhci_run
xhci_suspend
-
-# preserved by --additions-only
- __bitmap_equal
- down_read_trylock
- of_devfreq_cooling_register_power
- pkvm_iommu_finalize
- pkvm_iommu_resume
- pkvm_iommu_s2mpu_register
- pkvm_iommu_suspend
- pkvm_iommu_sysmmu_sync_register
- shmem_file_setup
- split_page
- system_long_wq
- thermal_zone_get_temp
- vb2_common_vm_ops
- vb2_create_framevec
- vb2_destroy_framevec
- vm_map_pages
- vm_map_ram
- vm_unmap_ram