diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 661107602e22..a05d9265a6a8 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -2334,6 +2334,9 @@
+
+
+
@@ -2580,6 +2583,7 @@
+
@@ -3238,6 +3242,8 @@
+
+
@@ -3290,6 +3296,7 @@
+
@@ -3363,14 +3370,24 @@
+
+
+
+
+
+
+
+
+
+
@@ -15111,7 +15128,7 @@
-
+
@@ -15442,7 +15459,7 @@
-
+
@@ -33247,7 +33264,7 @@
-
+
@@ -34074,6 +34091,7 @@
+
@@ -45123,7 +45141,7 @@
-
+
@@ -57717,7 +57735,7 @@
-
+
@@ -64726,6 +64744,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -64838,7 +64867,7 @@
-
+
@@ -68585,7 +68614,7 @@
-
+
@@ -70376,10 +70405,10 @@
-
+
-
+
@@ -73186,7 +73215,7 @@
-
+
@@ -73194,7 +73223,7 @@
-
+
@@ -73293,7 +73322,7 @@
-
+
@@ -73301,7 +73330,7 @@
-
+
@@ -73309,10 +73338,10 @@
-
+
-
+
@@ -73357,34 +73386,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -73446,15 +73475,15 @@
-
+
-
+
-
+
@@ -73462,7 +73491,7 @@
-
+
@@ -73498,7 +73527,7 @@
-
+
@@ -73506,7 +73535,7 @@
-
+
@@ -73522,10 +73551,10 @@
-
+
-
+
@@ -73637,16 +73666,16 @@
-
+
-
+
-
+
-
+
@@ -73716,7 +73745,7 @@
-
+
@@ -73727,10 +73756,10 @@
-
+
-
+
@@ -73855,18 +73884,18 @@
-
+
-
+
-
+
-
+
@@ -90076,7 +90105,7 @@
-
+
@@ -94959,7 +94988,7 @@
-
+
@@ -96069,7 +96098,7 @@
-
+
@@ -97998,7 +98027,7 @@
-
+
@@ -99186,7 +99215,7 @@
-
+
@@ -101471,7 +101500,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -101479,7 +101519,7 @@
-
+
@@ -101487,7 +101527,7 @@
-
+
@@ -101495,7 +101535,7 @@
-
+
@@ -101503,7 +101543,7 @@
-
+
@@ -101517,7 +101557,7 @@
-
+
@@ -101534,7 +101574,7 @@
-
+
@@ -101542,7 +101582,7 @@
-
+
@@ -101571,7 +101611,7 @@
-
+
@@ -101579,7 +101619,7 @@
-
+
@@ -101587,7 +101627,7 @@
-
+
@@ -101601,7 +101641,7 @@
-
+
@@ -101612,7 +101652,7 @@
-
+
@@ -101620,7 +101660,7 @@
-
+
@@ -101628,17 +101668,17 @@
-
+
-
+
-
+
@@ -101673,7 +101713,7 @@
-
+
@@ -101684,7 +101724,7 @@
-
+
@@ -101692,7 +101732,7 @@
-
+
@@ -101700,7 +101740,7 @@
-
+
@@ -101711,7 +101751,7 @@
-
+
@@ -101725,7 +101765,7 @@
-
+
@@ -101733,7 +101773,7 @@
-
+
@@ -101741,7 +101781,7 @@
-
+
@@ -101749,7 +101789,7 @@
-
+
@@ -101757,7 +101797,7 @@
-
+
@@ -101765,7 +101805,7 @@
-
+
@@ -101812,7 +101852,7 @@
-
+
@@ -101823,7 +101863,7 @@
-
+
@@ -101843,7 +101883,7 @@
-
+
@@ -101866,7 +101906,7 @@
-
+
@@ -101886,26 +101926,26 @@
-
+
-
+
-
+
-
+
-
+
@@ -101919,7 +101959,7 @@
-
+
@@ -101927,7 +101967,7 @@
-
+
@@ -101947,7 +101987,7 @@
-
+
@@ -101970,7 +102010,7 @@
-
+
@@ -101978,7 +102018,7 @@
-
+
@@ -101986,7 +102026,7 @@
-
+
@@ -101994,7 +102034,7 @@
-
+
@@ -102002,7 +102042,7 @@
-
+
@@ -102028,17 +102068,17 @@
-
+
-
+
-
+
@@ -102046,17 +102086,17 @@
-
+
-
+
-
+
@@ -102073,17 +102113,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -104900,7 +104929,7 @@
-
+
@@ -105077,7 +105106,7 @@
-
+
@@ -127049,6 +127078,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -128267,6 +128321,10 @@
+
+
+
+
@@ -131636,6 +131694,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -131888,6 +131956,10 @@
+
+
+
+
@@ -132248,6 +132320,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -132255,6 +132339,12 @@
+
+
+
+
+
+
@@ -132263,6 +132353,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -132281,6 +132387,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -132288,6 +132408,13 @@
+
+
+
+
+
+
+
diff --git a/android/abi_gki_aarch64_rockchip b/android/abi_gki_aarch64_rockchip
index 569f47c51b90..df7fff3de5f9 100644
--- a/android/abi_gki_aarch64_rockchip
+++ b/android/abi_gki_aarch64_rockchip
@@ -6,6 +6,7 @@
alloc_chrdev_region
__alloc_disk_node
__alloc_pages_nodemask
+ __alloc_skb
alloc_workqueue
__arch_copy_from_user
__arch_copy_to_user
@@ -49,6 +50,7 @@
cancel_delayed_work
cancel_delayed_work_sync
cancel_work_sync
+ capable
cdev_device_add
cdev_device_del
cdev_init
@@ -71,6 +73,7 @@
__class_create
class_destroy
class_for_each_device
+ __class_register
clk_bulk_disable
clk_bulk_enable
clk_bulk_prepare
@@ -104,6 +107,8 @@
complete
completion_done
__const_udelay
+ consume_skb
+ cpu_bit_bitmap
__cpufreq_driver_target
cpufreq_generic_suspend
cpufreq_register_governor
@@ -486,6 +491,7 @@
fwnode_property_read_string
fwnode_property_read_u32_array
gcd
+ generic_file_llseek
generic_handle_irq
generic_mii_ioctl
__genphy_config_aneg
@@ -513,6 +519,7 @@
gpiod_cansleep
gpiod_direction_input
gpiod_direction_output
+ gpiod_direction_output_raw
gpiod_get_optional
gpiod_get_raw_value
gpiod_get_value
@@ -522,6 +529,7 @@
gpiod_set_value
gpiod_set_value_cansleep
gpiod_to_irq
+ gpio_free
gpio_to_desc
handle_nested_irq
handle_simple_irq
@@ -628,6 +636,7 @@
kmem_cache_free
kmemdup
kobject_create_and_add
+ kobject_init_and_add
kobject_put
kstrdup
kstrdup_const
@@ -703,6 +712,7 @@
mutex_lock_interruptible
mutex_trylock
mutex_unlock
+ __netdev_alloc_skb
netdev_err
netdev_info
netdev_warn
@@ -867,7 +877,9 @@
prepare_to_wait_event
print_hex_dump
printk
+ proc_create
proc_create_data
+ proc_mkdir
pskb_expand_head
put_device
put_disk
@@ -920,6 +932,7 @@
regulator_disable_regmap
regulator_enable
regulator_enable_regmap
+ regulator_get
regulator_get_optional
regulator_get_voltage
regulator_get_voltage_sel_regmap
@@ -943,8 +956,13 @@
reset_control_assert
reset_control_deassert
revalidate_disk_size
+ rfkill_alloc
+ rfkill_destroy
+ rfkill_register
+ rfkill_unregister
rtc_class_open
rtc_read_time
+ rtc_time64_to_tm
rtc_tm_to_time64
rtc_valid_tm
scatterwalk_map_and_copy
@@ -1031,19 +1049,25 @@
snd_soc_put_volsw
snd_soc_unregister_component
snprintf
+ sort
__spi_register_driver
spi_sync
sprintf
sscanf
__stack_chk_fail
+ strchr
strcmp
strcpy
strlcpy
strlen
+ strncasecmp
+ strncat
strncmp
strncpy
strnlen
+ strrchr
strscpy
+ strsep
strstr
__sw_hweight32
__sw_hweight64
@@ -1094,6 +1118,7 @@
__udelay
unregister_chrdev_region
unregister_reboot_notifier
+ up
update_devfreq
up_read
up_write
@@ -1232,6 +1257,7 @@
vmap
vm_get_page_prot
vm_map_pages
+ vsnprintf
vunmap
wait_for_completion
wait_for_completion_timeout
@@ -1240,6 +1266,7 @@
wakeup_source_add
wakeup_source_remove
__warn_printk
+ work_busy
# required by 8250_dw.ko
of_device_is_big_endian
@@ -1275,6 +1302,131 @@
pci_find_capability
pci_find_ext_capability
+# required by bcmdhd.ko
+ alloc_etherdev_mqs
+ __cfg80211_alloc_event_skb
+ __cfg80211_alloc_reply_skb
+ cfg80211_chandef_create
+ cfg80211_ch_switch_notify
+ cfg80211_connect_done
+ cfg80211_del_sta_sinfo
+ cfg80211_disconnected
+ cfg80211_external_auth_request
+ cfg80211_find_elem_match
+ cfg80211_get_bss
+ cfg80211_ibss_joined
+ cfg80211_inform_bss_frame_data
+ cfg80211_mgmt_tx_status
+ cfg80211_michael_mic_failure
+ cfg80211_new_sta
+ cfg80211_port_authorized
+ cfg80211_put_bss
+ cfg80211_ready_on_channel
+ cfg80211_remain_on_channel_expired
+ cfg80211_roamed
+ cfg80211_rx_mgmt_khz
+ cfg80211_scan_done
+ cfg80211_sched_scan_results
+ cfg80211_sched_scan_stopped
+ __cfg80211_send_event_skb
+ cfg80211_unlink_bss
+ cfg80211_unregister_wdev
+ cfg80211_vendor_cmd_reply
+ complete_and_exit
+ dev_close
+ dev_open
+ down
+ down_interruptible
+ down_timeout
+ eth_type_trans
+ free_netdev
+ ieee80211_channel_to_freq_khz
+ ieee80211_freq_khz_to_channel
+ ieee80211_get_channel_khz
+ init_net
+ iwe_stream_add_event
+ iwe_stream_add_point
+ iwe_stream_add_value
+ __kfifo_init
+ kfree_skb
+ kobject_uevent
+ __local_bh_enable_ip
+ mmc_set_data_timeout
+ mmc_sw_reset
+ mmc_wait_for_req
+ netdev_update_features
+ netif_rx
+ netif_rx_ni
+ netif_tx_wake_queue
+ __netlink_kernel_create
+ netlink_kernel_release
+ netlink_unicast
+ nla_append
+ nla_memcpy
+ nla_put
+ nla_put_nohdr
+ nla_reserve
+ __nlmsg_put
+ prandom_bytes
+ prandom_u32
+ _raw_read_lock_bh
+ _raw_read_unlock_bh
+ register_inetaddr_notifier
+ register_netdev
+ register_netdevice
+ register_netdevice_notifier
+ regulatory_hint
+ regulatory_set_wiphy_regd
+ regulatory_set_wiphy_regd_sync_rtnl
+ rtnl_is_locked
+ rtnl_lock
+ rtnl_unlock
+ sched_set_fifo_low
+ sdio_claim_host
+ sdio_disable_func
+ sdio_enable_func
+ sdio_f0_readb
+ sdio_f0_writeb
+ sdio_get_host_pm_caps
+ sdio_memcpy_fromio
+ sdio_memcpy_toio
+ sdio_readb
+ sdio_readl
+ sdio_readsb
+ sdio_readw
+ sdio_register_driver
+ sdio_release_host
+ sdio_retune_crc_disable
+ sdio_retune_crc_enable
+ sdio_retune_hold_now
+ sdio_retune_release
+ sdio_set_block_size
+ sdio_set_host_pm_flags
+ sdio_unregister_driver
+ sdio_writeb
+ sdio_writel
+ sdio_writew
+ set_cpus_allowed_ptr
+ simple_strtoul
+ skb_copy
+ __skb_pad
+ skb_realloc_headroom
+ sock_wfree
+ sprint_symbol
+ strcat
+ strspn
+ sys_tz
+ unregister_inetaddr_notifier
+ unregister_netdev
+ unregister_netdevice_notifier
+ unregister_netdevice_queue
+ unregister_pm_notifier
+ wiphy_free
+ wiphy_new_nm
+ wiphy_register
+ wiphy_unregister
+ wireless_send_event
+
# required by bifrost_kbase.ko
__arch_clear_user
__bitmap_andnot
@@ -1300,13 +1452,11 @@
dump_stack
find_get_pid
freezing_slow_path
- generic_file_llseek
get_user_pages
get_user_pages_fast
hrtimer_active
iomem_resource
kobject_del
- kobject_init_and_add
kstrndup
kstrtobool_from_user
ktime_get_raw
@@ -1367,7 +1517,6 @@
in6_dev_finish_destroy
__ipv6_addr_type
ipv6_stub
- __netdev_alloc_skb
__vlan_find_dev_deep_rcu
# required by clk-link.ko
@@ -1542,9 +1691,6 @@
usb_speed_string
usb_wakeup_enabled_descendants
-# required by fp5510.ko
- up
-
# required by fusb302.ko
extcon_get_extcon_dev
fwnode_create_software_node
@@ -1558,7 +1704,6 @@
tcpm_register_port
tcpm_unregister_port
tcpm_vbus_change
- vsnprintf
# required by gc2145.ko
v4l2_ctrl_subdev_log_status
@@ -1567,9 +1712,6 @@
aes_expandkey
gf128mul_lle
-# required by gl620a.ko
- __alloc_skb
-
# required by gpio-regulator.ko
gpiod_count
@@ -1618,9 +1760,6 @@
# required by i2c-rk3x.ko
i2c_parse_fw_timings
-# required by iep.ko
- proc_create
-
# required by industrialio-buffer-cb.ko
bitmap_free
bitmap_zalloc
@@ -1690,7 +1829,6 @@
blk_set_queue_dying
blk_status_to_errno
blk_sync_queue
- capable
cleanup_srcu_struct
device_remove_file_self
dev_pm_qos_expose_latency_tolerance
@@ -1818,7 +1956,6 @@
videomode_from_timing
# required by pcie-dw-rockchip.ko
- cpu_bit_bitmap
cpumask_next_and
debugfs_create_devm_seqfile
dw_pcie_find_ext_capability
@@ -1905,7 +2042,6 @@
pm_genpd_init
pm_genpd_remove
pm_wq
- strrchr
# required by pwm-regulator.ko
regulator_map_voltage_iterate
@@ -1925,6 +2061,13 @@
devres_release
kernel_kobj
+# required by rfkill-rk.ko
+ gpio_request
+ kstrtoll
+ rfkill_init_sw_state
+ rfkill_set_hw_state
+ rfkill_set_sw_state
+
# required by rga3.ko
alloc_iova_fast
dma_fence_wait_timeout
@@ -2026,9 +2169,7 @@
pm_generic_runtime_resume
pm_generic_runtime_suspend
proc_create_single_data
- proc_mkdir
proc_remove
- strncat
# required by rknpu.ko
dev_pm_domain_attach_by_name
@@ -2107,10 +2248,7 @@
dev_pm_qos_add_request
dev_pm_qos_remove_request
dev_pm_qos_update_request
- regulator_get
remove_cpu
- strchr
- strsep
thermal_zone_get_temp
# required by rockchip_thermal.ko
@@ -2281,7 +2419,6 @@
platform_find_device_by_driver
__platform_register_drivers
platform_unregister_drivers
- sort
__sw_hweight8
__vmalloc
@@ -2291,7 +2428,6 @@
# required by rtc-rk808.ko
devm_rtc_allocate_device
__rtc_register_device
- rtc_time64_to_tm
rtc_update_irq
# required by sdhci-of-arasan.ko
@@ -2443,7 +2579,6 @@
# required by test_power.ko
param_get_int
- strncasecmp
# required by timer-rockchip.ko
clockevents_config_and_register
@@ -2525,7 +2660,6 @@
# required by video_rkcif.ko
media_entity_setup_link
- work_busy
# required by video_rkisp.ko
media_device_cleanup
@@ -2552,7 +2686,6 @@
__alloc_percpu
bio_endio
blk_alloc_queue
- __class_register
class_unregister
__cpuhp_state_add_instance
__cpuhp_state_remove_instance