diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 4b2111b34ed6..95915ee26106 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -391,6 +391,9 @@
+
+
+
@@ -468,6 +471,7 @@
+
@@ -561,6 +565,7 @@
+
@@ -5779,6 +5784,9 @@
+
+
+
@@ -5868,6 +5876,7 @@
+
@@ -5967,6 +5976,7 @@
+
@@ -22886,7 +22896,59 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -80641,54 +80703,54 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -91517,6 +91579,14 @@
+
+
+
+
+
+
+
+
@@ -104548,66 +104618,66 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -110147,6 +110217,9 @@
+
+
+
@@ -113100,10 +113173,10 @@
-
-
-
-
+
+
+
+
@@ -114521,10 +114594,10 @@
-
-
-
-
+
+
+
+
@@ -114537,14 +114610,14 @@
-
-
-
+
+
+
-
-
-
+
+
+
@@ -115190,6 +115263,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -115281,10 +115375,10 @@
-
-
-
-
+
+
+
+
@@ -115666,6 +115760,12 @@
+
+
+
+
+
+
@@ -115756,11 +115856,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -116238,6 +116338,13 @@
+
+
+
+
+
+
+
@@ -116364,11 +116471,11 @@
-
+
-
-
+
+
@@ -116473,12 +116580,15 @@
+
+
+
-
+
@@ -116488,7 +116598,7 @@
-
+
@@ -116562,6 +116672,7 @@
+
@@ -116578,7 +116689,7 @@
-
+
@@ -116661,6 +116772,7 @@
+
@@ -119426,9 +119538,9 @@
-
-
-
+
+
+
@@ -119436,13 +119548,13 @@
-
-
-
-
+
+
+
+
-
+
@@ -119481,45 +119593,45 @@
-
-
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
@@ -119536,25 +119648,25 @@
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
@@ -132940,9 +133052,9 @@
-
-
-
+
+
+
@@ -134133,8 +134245,8 @@
-
-
+
+
@@ -135440,38 +135552,38 @@
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -138507,7 +138619,7 @@
-
+
@@ -138648,9 +138760,9 @@
-
-
-
+
+
+
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index 08f0c30078da..bb62b99da69a 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -1113,8 +1113,8 @@
init_uts_ns
init_wait_entry
__init_waitqueue_head
- inode_permission
inode_owner_or_capable
+ inode_permission
input_alloc_absinfo
input_allocate_device
input_close_device
@@ -2605,6 +2605,9 @@
__traceiter_android_vh_clear_reserved_fmt_fields
__traceiter_android_vh_commit_creds
__traceiter_android_vh_cpufreq_acct_update_power
+ __traceiter_android_vh_cpufreq_fast_switch
+ __traceiter_android_vh_cpufreq_resolve_freq
+ __traceiter_android_vh_cpufreq_target
__traceiter_android_vh_cpu_idle_enter
__traceiter_android_vh_cpu_idle_exit
__traceiter_android_vh_cpu_up
@@ -2652,6 +2655,7 @@
__traceiter_android_vh_rwsem_write_finished
__traceiter_android_vh_save_track_hash
__traceiter_android_vh_save_vmalloc_stack
+ __traceiter_android_vh_sched_stat_runtime_rt
__traceiter_android_vh_scheduler_tick
__traceiter_android_vh_selinux_avc_insert
__traceiter_android_vh_selinux_avc_lookup
@@ -2695,6 +2699,7 @@
__traceiter_sched_overutilized_tp
__traceiter_sched_stat_blocked
__traceiter_sched_stat_iowait
+ __traceiter_sched_stat_runtime
__traceiter_sched_stat_sleep
__traceiter_sched_stat_wait
__traceiter_sched_switch
@@ -2791,6 +2796,9 @@
__tracepoint_android_vh_clear_reserved_fmt_fields
__tracepoint_android_vh_commit_creds
__tracepoint_android_vh_cpufreq_acct_update_power
+ __tracepoint_android_vh_cpufreq_fast_switch
+ __tracepoint_android_vh_cpufreq_resolve_freq
+ __tracepoint_android_vh_cpufreq_target
__tracepoint_android_vh_cpu_idle_enter
__tracepoint_android_vh_cpu_idle_exit
__tracepoint_android_vh_cpu_up
@@ -2838,6 +2846,7 @@
__tracepoint_android_vh_rwsem_write_finished
__tracepoint_android_vh_save_track_hash
__tracepoint_android_vh_save_vmalloc_stack
+ __tracepoint_android_vh_sched_stat_runtime_rt
__tracepoint_android_vh_scheduler_tick
__tracepoint_android_vh_selinux_avc_insert
__tracepoint_android_vh_selinux_avc_lookup
@@ -2884,6 +2893,7 @@
__tracepoint_sched_overutilized_tp
__tracepoint_sched_stat_blocked
__tracepoint_sched_stat_iowait
+ __tracepoint_sched_stat_runtime
__tracepoint_sched_stat_sleep
__tracepoint_sched_stat_wait
__tracepoint_sched_switch