diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 6c948e769c91..acce71cb90c3 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -388,6 +388,7 @@
+
@@ -947,6 +948,7 @@
+
@@ -959,6 +961,7 @@
+
@@ -1691,6 +1694,7 @@
+
@@ -1738,6 +1742,8 @@
+
+
@@ -2336,9 +2342,11 @@
+
+
@@ -2726,6 +2734,7 @@
+
@@ -3552,8 +3561,11 @@
+
+
+
@@ -3608,7 +3620,15 @@
+
+
+
+
+
+
+
+
@@ -3694,6 +3714,7 @@
+
@@ -3712,7 +3733,9 @@
+
+
@@ -3728,6 +3751,9 @@
+
+
+
@@ -3735,19 +3761,25 @@
+
+
+
+
+
+
@@ -3755,6 +3787,8 @@
+
+
@@ -3762,10 +3796,14 @@
+
+
+
+
@@ -3783,8 +3821,13 @@
+
+
+
+
+
@@ -3794,6 +3837,7 @@
+
@@ -14831,7 +14875,7 @@
-
+
@@ -19946,6 +19990,7 @@
+
@@ -36281,6 +36326,7 @@
+
@@ -40405,6 +40451,7 @@
+
@@ -42007,6 +42054,7 @@
+
@@ -58466,6 +58514,7 @@
+
@@ -64209,6 +64258,7 @@
+
@@ -64765,6 +64815,7 @@
+
@@ -74862,6 +74913,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -91534,6 +91596,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -94931,6 +95007,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -96473,6 +96563,7 @@
+
@@ -102499,6 +102590,10 @@
+
+
+
+
@@ -114018,6 +114113,11 @@
+
+
+
+
+
@@ -117044,6 +117144,13 @@
+
+
+
+
+
+
+
@@ -117119,6 +117226,13 @@
+
+
+
+
+
+
+
@@ -120992,6 +121106,10 @@
+
+
+
+
@@ -121231,6 +121349,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -124303,6 +124432,12 @@
+
+
+
+
+
+
@@ -124318,6 +124453,10 @@
+
+
+
+
@@ -126297,6 +126436,10 @@
+
+
+
+
@@ -130594,6 +130737,11 @@
+
+
+
+
+
@@ -130602,6 +130750,14 @@
+
+
+
+
+
+
+
+
@@ -130882,10 +131038,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -131297,6 +131491,11 @@
+
+
+
+
+
@@ -131397,10 +131596,19 @@
+
+
+
+
+
+
+
+
+
@@ -131469,6 +131677,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -131500,6 +131726,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -131509,6 +131746,12 @@
+
+
+
+
+
+
@@ -131522,6 +131765,10 @@
+
+
+
+
@@ -131529,6 +131776,10 @@
+
+
+
+
@@ -131560,6 +131811,12 @@
+
+
+
+
+
+
@@ -131592,7 +131849,16 @@
+
+
+
+
+
+
+
+
+
@@ -131629,6 +131895,15 @@
+
+
+
+
+
+
+
+
+
@@ -131641,10 +131916,19 @@
+
+
+
+
+
+
+
+
+
@@ -131720,15 +132004,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -131781,6 +132088,11 @@
+
+
+
+
+
diff --git a/android/abi_gki_aarch64_rockchip b/android/abi_gki_aarch64_rockchip
index 52df2228c0a0..29cbde4b0ca6 100644
--- a/android/abi_gki_aarch64_rockchip
+++ b/android/abi_gki_aarch64_rockchip
@@ -2,6 +2,7 @@
# commonly used symbols
add_timer
alloc_workqueue
+ __arch_copy_from_user
arm64_const_caps_ready
arm64_use_ng_mappings
atomic_notifier_chain_register
@@ -13,7 +14,9 @@
blocking_notifier_chain_unregister
cancel_delayed_work
cancel_delayed_work_sync
+ cancel_work_sync
__cfi_slowpath
+ __check_object_size
class_for_each_device
clk_bulk_disable
clk_bulk_enable
@@ -44,6 +47,7 @@
cpufreq_register_notifier
cpufreq_unregister_governor
cpu_hwcap_keys
+ cpu_hwcaps
cpu_latency_qos_add_request
cpu_latency_qos_update_request
cpumask_next
@@ -52,12 +56,15 @@
__cpu_possible_mask
cpus_read_lock
cpus_read_unlock
+ crc32_le
debugfs_create_dir
debugfs_create_file
debugfs_remove
delayed_work_timer_fn
del_timer
+ del_timer_sync
destroy_workqueue
+ dev_driver_string
_dev_err
dev_err_probe
devfreq_recommended_opp
@@ -65,9 +72,14 @@
device_create_file
device_init_wakeup
device_property_present
+ device_property_read_string
device_property_read_u32_array
device_property_read_u8_array
+ device_set_wakeup_capable
+ device_wakeup_enable
_dev_info
+ __dev_kfree_skb_any
+ devm_add_action
devm_clk_bulk_get_all
devm_clk_get
devm_clk_hw_register
@@ -85,6 +97,7 @@
devm_mfd_add_devices
devm_nvmem_register
devm_of_clk_add_hw_provider
+ devm_phy_get
devm_pinctrl_get
devm_pinctrl_register
devm_platform_ioremap_resource
@@ -98,6 +111,7 @@
devm_request_threaded_irq
devm_reset_control_array_get
__devm_reset_control_get
+ devm_usb_get_phy
dev_pm_opp_find_freq_ceil
dev_pm_opp_get_opp_count
dev_pm_opp_get_opp_table
@@ -114,12 +128,17 @@
devres_free
_dev_warn
disable_irq
+ dma_alloc_attrs
+ dma_free_attrs
dmam_alloc_attrs
dma_map_sg_attrs
+ dmam_free_coherent
dma_set_coherent_mask
dma_set_mask
dma_sync_sg_for_cpu
dma_sync_sg_for_device
+ dma_sync_single_for_cpu
+ dma_sync_single_for_device
dma_unmap_sg_attrs
down_read
down_write
@@ -131,6 +150,7 @@
drm_mode_set_name
drm_mode_vrefresh
enable_irq
+ eth_validate_addr
extcon_get_edev_by_phandle
extcon_get_state
extcon_register_notifier
@@ -138,10 +158,16 @@
find_next_bit
finish_wait
flush_workqueue
+ free_irq
freq_qos_add_request
freq_qos_remove_request
freq_qos_update_request
+ fwnode_handle_put
+ gcd
+ generic_mii_ioctl
+ gen_pool_free_owner
get_cpu_device
+ gic_nonsecure_priorities
gpiochip_add_pin_range
gpiochip_generic_free
gpiochip_generic_request
@@ -160,6 +186,7 @@
i2c_register_driver
i2c_smbus_read_byte_data
i2c_smbus_read_i2c_block_data
+ i2c_smbus_write_byte_data
i2c_smbus_write_i2c_block_data
__init_swait_queue_head
init_timer_key
@@ -186,16 +213,20 @@
__log_read_mmio
__log_write_mmio
memcpy
+ memmove
memset
memstart_addr
mmc_of_parse
+ mod_delayed_work_on
mod_timer
module_layout
__msecs_to_jiffies
msleep
__mutex_init
mutex_lock
+ mutex_lock_interruptible
mutex_unlock
+ netdev_err
nr_cpu_ids
ns_to_timespec64
nvmem_cell_put
@@ -235,8 +266,13 @@
of_property_read_variable_u32_array
of_regulator_match
panic_notifier_list
+ param_ops_bool
param_ops_int
__per_cpu_offset
+ phy_exit
+ phy_init
+ phy_power_off
+ phy_power_on
pinconf_generic_dt_node_to_map
pinctrl_dev_get_drvdata
pinctrl_gpio_direction_input
@@ -259,6 +295,7 @@
pm_runtime_enable
pm_runtime_force_resume
pm_runtime_force_suspend
+ __pm_runtime_idle
__pm_runtime_resume
pm_runtime_set_autosuspend_delay
__pm_runtime_set_status
@@ -286,8 +323,10 @@
queue_work_on
___ratelimit
_raw_spin_lock
+ _raw_spin_lock_irq
_raw_spin_lock_irqsave
_raw_spin_unlock
+ _raw_spin_unlock_irq
_raw_spin_unlock_irqrestore
rdev_get_drvdata
rdev_get_id
@@ -320,13 +359,17 @@
regulator_set_voltage_sel_regmap
regulator_set_voltage_time_sel
regulator_unregister
+ request_threaded_irq
reset_control_assert
reset_control_deassert
rtc_class_open
rtc_read_time
rtc_tm_to_time64
rtc_valid_tm
+ sched_clock
+ schedule
schedule_timeout
+ scnprintf
sdhci_add_host
sdhci_get_property
sdhci_pltfm_clk_get_max_clock
@@ -339,15 +382,22 @@
sdhci_suspend_host
seq_lseek
seq_printf
+ seq_puts
seq_read
sg_next
single_open
single_release
+ skb_copy_expand
+ skb_pull
+ skb_push
+ skb_put
+ skb_trim
snprintf
sprintf
sscanf
__stack_chk_fail
strcmp
+ synchronize_irq
syscon_node_to_regmap
syscon_regmap_lookup_by_phandle
sysfs_create_file_ns
@@ -355,6 +405,7 @@
system_state
system_wq
tasklet_init
+ tcpm_tcpc_reset
thermal_zone_get_zone_by_name
__traceiter_rwmmio_post_read
__traceiter_rwmmio_read
@@ -366,6 +417,43 @@
update_devfreq
up_read
up_write
+ usb_add_hcd
+ usb_calc_bus_time
+ usb_control_msg
+ usb_create_hcd
+ usb_debug_root
+ usb_deregister
+ usb_disabled
+ usb_hcd_check_unlink_urb
+ usb_hcd_giveback_urb
+ usb_hcd_link_urb_to_ep
+ usb_hcd_resume_root_hub
+ usb_hcd_unlink_urb_from_ep
+ usbnet_change_mtu
+ usbnet_disconnect
+ usbnet_get_drvinfo
+ usbnet_get_endpoints
+ usbnet_get_link_ksettings
+ usbnet_get_msglevel
+ usbnet_get_stats64
+ usbnet_link_change
+ usbnet_nway_reset
+ usbnet_open
+ usbnet_probe
+ usbnet_read_cmd
+ usbnet_resume
+ usbnet_set_link_ksettings
+ usbnet_set_msglevel
+ usbnet_skb_return
+ usbnet_start_xmit
+ usbnet_stop
+ usbnet_suspend
+ usbnet_tx_timeout
+ usbnet_write_cmd
+ usbnet_write_cmd_async
+ usb_put_hcd
+ usb_register_driver
+ usb_remove_hcd
usleep_range
vmap
wait_for_completion_timeout
@@ -381,7 +469,6 @@
power_supply_get_by_name
# required by bq25890_charger.ko
- devm_usb_get_phy
system_power_efficient_wq
# required by clk-link.ko
@@ -411,7 +498,6 @@
clk_register_gate
clk_register_mux_table
clk_unregister
- gcd
match_string
of_clk_src_onecell_get
rational_best_approximation
@@ -460,9 +546,7 @@
# required by cqhci.ko
devm_blk_ksm_init
devm_ioremap
- dmam_free_coherent
mmc_cqe_request_done
- schedule
# required by cw2017_battery.ko
bcmp
@@ -479,6 +563,12 @@
i2c_put_adapter
of_get_i2c_adapter_by_node
+# required by dm9601.ko
+ mii_check_media
+ mii_ethtool_gset
+ mii_link_ok
+ mii_nway_restart
+
# required by dw_mmc-rockchip.ko
clk_get_phase
mmc_send_tuning
@@ -486,7 +576,6 @@
# required by dw_mmc.ko
debugfs_create_u32
debugfs_create_x64
- del_timer_sync
device_property_read_string_array
dma_release_channel
dma_request_chan
@@ -510,6 +599,68 @@
sg_miter_stop
__tasklet_schedule
+# required by dwc2.ko
+ __bitmap_clear
+ bitmap_find_next_zero_area_off
+ __bitmap_set
+ debugfs_create_regset32
+ devm_platform_get_and_ioremap_resource
+ devm_regulator_bulk_get
+ dma_map_page_attrs
+ dma_unmap_page_attrs
+ hrtimer_cancel
+ hrtimer_init
+ hrtimer_start_range_ns
+ is_vmalloc_addr
+ kmem_cache_alloc
+ kmem_cache_create
+ kmem_cache_destroy
+ kmem_cache_free
+ phy_reset
+ _raw_spin_trylock
+ regulator_bulk_disable
+ regulator_bulk_enable
+ usb_add_gadget_udc
+ usb_del_gadget_udc
+ usb_ep_set_maxpacket_limit
+ usb_gadget_giveback_request
+ usb_gadget_map_request
+ usb_gadget_set_state
+ usb_gadget_unmap_request
+ usb_get_dr_mode
+ usb_hcd_map_urb_for_dma
+ usb_hcd_unmap_urb_for_dma
+ usb_hub_clear_tt_buffer
+ usb_phy_set_charger_current
+ usb_role_switch_get_drvdata
+ usb_role_switch_register
+ usb_role_switch_unregister
+ usb_speed_string
+ usb_wakeup_enabled_descendants
+
+# required by fusb302.ko
+ device_get_named_child_node
+ disable_irq_nosync
+ extcon_get_extcon_dev
+ fwnode_create_software_node
+ kthread_create_worker
+ kthread_destroy_worker
+ kthread_flush_worker
+ kthread_queue_work
+ sched_set_fifo
+ strlcpy
+ tcpm_cc_change
+ tcpm_pd_hard_reset
+ tcpm_pd_receive
+ tcpm_pd_transmit_complete
+ tcpm_register_port
+ tcpm_unregister_port
+ tcpm_vbus_change
+ vsnprintf
+
+# required by gl620a.ko
+ __alloc_skb
+
# required by gpio-regulator.ko
devm_gpiod_get_index
gpiod_count
@@ -547,6 +698,10 @@
regulator_register_notifier
regulator_unregister_notifier
+# required by kalmia.ko
+ skb_clone
+ usb_bulk_msg
+
# required by kfifo_buf.ko
iio_buffer_init
iio_buffer_put
@@ -554,12 +709,39 @@
__kfifo_free
__kfifo_in
__kfifo_to_user
- mutex_lock_interruptible
+
+# required by mcs7830.ko
+ usbnet_get_link
# required by nvmem-rockchip-otp.ko
devm_clk_bulk_get
param_ops_uint
+# required by ohci-hcd.ko
+ default_llseek
+ dma_pool_alloc
+ dma_pool_create
+ dma_pool_destroy
+ dma_pool_free
+ flush_work
+ free_pages
+ gen_pool_dma_alloc_align
+ gen_pool_dma_zalloc_align
+ get_zeroed_page
+ sb800_prefetch
+ schedule_timeout_uninterruptible
+ simple_read_from_buffer
+ usb_amd_dev_put
+ usb_amd_quirk_pll_disable
+ usb_amd_quirk_pll_enable
+ usb_hc_died
+ usb_hcd_poll_rh_status
+ usb_hcds_loaded
+ usb_root_hub_lost_power
+
+# required by ohci-platform.ko
+ usb_hcd_platform_shutdown
+
# required by panel-simple.ko
devm_backlight_device_register
drm_add_edid_modes
@@ -603,7 +785,6 @@
clk_bulk_put
of_genpd_add_provider_onecell
panic
- param_ops_bool
pm_clk_add_clk
pm_genpd_add_subdomain
pm_genpd_init
@@ -639,9 +820,6 @@
regmap_del_irq_chip
unregister_syscore_ops
-# required by rk817_charger.ko
- dev_driver_string
-
# required by rk860x-regulator.ko
regulator_suspend_enable
@@ -656,7 +834,6 @@
# required by rockchip-dfi.ko
devm_devfreq_event_add_edev
- gic_nonsecure_priorities
# required by rockchip.ko
__genphy_config_aneg
@@ -716,9 +893,6 @@
regulator_get_linear_step
regulator_get_optional
-# required by rockchip_pvtm.ko
- seq_puts
-
# required by rockchip_pwm_remotectl.ko
devm_input_allocate_device
input_event
@@ -729,7 +903,6 @@
wakeup_source_remove
# required by rockchip_saradc.ko
- devm_add_action
devm_iio_device_alloc
__devm_iio_device_register
iio_get_time_ns
@@ -740,7 +913,6 @@
__arm_smccc_smc
__ioremap
pfn_valid
- sched_clock
# required by rockchip_system_monitor.ko
add_cpu
@@ -751,7 +923,6 @@
dev_pm_qos_update_request
kstrdup
kstrtoull
- mod_delayed_work_on
regulator_get
remove_cpu
strchr
@@ -779,17 +950,13 @@
device_link_add
device_link_del
devm_clk_get_optional
- dma_alloc_attrs
dma_buf_attach
dma_buf_detach
dma_buf_map_attachment
dma_buf_put
dma_buf_unmap_attachment
- dma_free_attrs
dma_get_sgtable_attrs
dma_mmap_attrs
- dma_sync_single_for_cpu
- dma_sync_single_for_device
drm_add_modes_noedid
drm_atomic_commit
drm_atomic_get_connector_state
@@ -954,7 +1121,6 @@
gen_pool_alloc_algo_owner
gen_pool_create
gen_pool_destroy
- gen_pool_free_owner
iommu_attach_device
iommu_detach_device
iommu_domain_alloc
@@ -980,16 +1146,12 @@
__platform_register_drivers
platform_unregister_drivers
pm_runtime_get_if_active
- __pm_runtime_idle
- _raw_spin_lock_irq
- _raw_spin_unlock_irq
refcount_warn_saturate
sg_free_table
sort
strlen
__sw_hweight32
__sw_hweight8
- synchronize_irq
system_unbound_wq
__vmalloc
vm_get_page_prot
@@ -998,7 +1160,6 @@
# required by rtc-hym8563.ko
devm_rtc_device_register
- i2c_smbus_write_byte_data
# required by rtc-rk808.ko
devm_rtc_allocate_device
@@ -1008,11 +1169,6 @@
rtc_update_irq
# required by sdhci-of-arasan.ko
- devm_phy_get
- phy_exit
- phy_init
- phy_power_off
- phy_power_on
__sdhci_add_host
sdhci_cleanup_host
sdhci_cqe_disable
@@ -1037,11 +1193,62 @@
# required by sgm41542_charger.ko
strncpy
+# required by tcpci_husb311.ko
+ i2c_smbus_read_word_data
+ tcpci_get_tcpm_port
+ tcpci_irq
+ tcpci_register_port
+ tcpci_unregister_port
+
# required by timer-rockchip.ko
clockevents_config_and_register
irq_of_parse_and_map
- request_threaded_irq
# required by tps65132-regulator.ko
devm_fwnode_gpiod_get_index
regulator_set_active_discharge_regmap
+
+# required by trancevibrator.ko
+ kstrtoint
+ usb_get_dev
+ usb_put_dev
+
+# required by typec_displayport.ko
+ fwnode_find_reference
+ sysfs_create_group
+ __sysfs_match_string
+ sysfs_notify
+ sysfs_remove_group
+ typec_altmode2port
+ typec_altmode_enter
+ typec_altmode_exit
+ typec_altmode_get_partner
+ typec_altmode_notify
+ __typec_altmode_register_driver
+ typec_altmode_unregister_driver
+ typec_altmode_vdm
+ typec_get_negotiated_svdm_version
+
+# required by usblp.ko
+ add_wait_queue
+ __arch_copy_to_user
+ default_wake_function
+ noop_llseek
+ remove_wait_queue
+ stpcpy
+ usb_alloc_urb
+ usb_anchor_urb
+ usb_autopm_get_interface
+ usb_autopm_put_interface
+ usb_deregister_dev
+ usb_find_common_endpoints
+ usb_find_interface
+ usb_free_urb
+ usb_get_intf
+ usb_kill_anchored_urbs
+ usb_poison_anchored_urbs
+ usb_put_intf
+ usb_register_dev
+ usb_set_interface
+ usb_submit_urb
+ usb_unanchor_urb