diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 4586e15d2277..5f1604018676 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -1169,11 +1169,13 @@
       <elf-symbol name='drm_crtc_init_with_planes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x37fc8c6a'/>
       <elf-symbol name='drm_crtc_send_vblank_event' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd06997b0'/>
       <elf-symbol name='drm_crtc_set_max_vblank_count' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x387b90e1'/>
+      <elf-symbol name='drm_crtc_vblank_count' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x16b1f18a'/>
       <elf-symbol name='drm_crtc_vblank_get' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1a191c1d'/>
       <elf-symbol name='drm_crtc_vblank_off' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7c8e1ec3'/>
       <elf-symbol name='drm_crtc_vblank_on' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x6a085c1b'/>
       <elf-symbol name='drm_crtc_vblank_put' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1987dfa6'/>
       <elf-symbol name='drm_crtc_vblank_reset' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1bca348c'/>
+      <elf-symbol name='drm_crtc_vblank_waitqueue' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8d33635b'/>
       <elf-symbol name='drm_crtc_wait_one_vblank' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x92e45f4d'/>
       <elf-symbol name='drm_cvt_mode' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf25aaeb2'/>
       <elf-symbol name='drm_dbg' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x34a4640a'/>
@@ -2902,6 +2904,7 @@
       <elf-symbol name='remap_vmalloc_range' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xce3d1805'/>
       <elf-symbol name='remove_arg_zero' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa815aeb3'/>
       <elf-symbol name='remove_proc_entry' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x871ec87f'/>
+      <elf-symbol name='remove_proc_subtree' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x28ac8b85'/>
       <elf-symbol name='remove_wait_queue' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x37110088'/>
       <elf-symbol name='report_iommu_fault' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x87f1db1c'/>
       <elf-symbol name='request_firmware' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4c57ef17'/>
@@ -4082,6 +4085,7 @@
       <elf-symbol name='wait_for_completion_interruptible_timeout' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa33c0eac'/>
       <elf-symbol name='wait_for_completion_io_timeout' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x139cee21'/>
       <elf-symbol name='wait_for_completion_killable' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa096b889'/>
+      <elf-symbol name='wait_for_completion_killable_timeout' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x917490b'/>
       <elf-symbol name='wait_for_completion_timeout' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4d1ff60a'/>
       <elf-symbol name='wait_woken' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb308c97d'/>
       <elf-symbol name='wake_up_process' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x58c2c8b3'/>
@@ -29914,6 +29918,10 @@
         <parameter type-id='e3dd029e' name='old_state' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='1432' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='drm_crtc_vblank_count' mangled-name='drm_crtc_vblank_count' filepath='include/drm/drm_vblank.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_crtc_vblank_count'>
+        <parameter type-id='b64ad7cb'/>
+        <return type-id='3a47d82b'/>
+      </function-decl>
       <function-decl name='drm_atomic_helper_commit_tail' mangled-name='drm_atomic_helper_commit_tail' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='1529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_atomic_helper_commit_tail'>
         <parameter type-id='e3dd029e' name='old_state' filepath='drivers/gpu/drm/drm_atomic_helper.c' line='1529' column='1'/>
         <return type-id='48b5725f'/>
@@ -37469,6 +37477,10 @@
         <parameter type-id='f0981eeb' name='num_crtcs' filepath='drivers/gpu/drm/drm_vblank.c' line='444' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='drm_crtc_vblank_waitqueue' mangled-name='drm_crtc_vblank_waitqueue' filepath='drivers/gpu/drm/drm_vblank.c' line='499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_crtc_vblank_waitqueue'>
+        <parameter type-id='b64ad7cb' name='crtc' filepath='drivers/gpu/drm/drm_vblank.c' line='499' column='1'/>
+        <return type-id='03d48e96'/>
+      </function-decl>
       <function-decl name='drm_calc_vbltimestamp_from_scanoutpos' mangled-name='drm_calc_vbltimestamp_from_scanoutpos' filepath='drivers/gpu/drm/drm_vblank.c' line='596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_calc_vbltimestamp_from_scanoutpos'>
         <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_vblank.c' line='596' column='1'/>
         <parameter type-id='f0981eeb' name='pipe' filepath='drivers/gpu/drm/drm_vblank.c' line='597' column='1'/>
@@ -85740,6 +85752,11 @@
         <parameter type-id='eaa32e2f' name='data' filepath='fs/proc/generic.c' line='463' column='1'/>
         <return type-id='d077e929'/>
       </function-decl>
+      <function-decl name='remove_proc_subtree' mangled-name='remove_proc_subtree' filepath='fs/proc/generic.c' line='689' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='remove_proc_subtree'>
+        <parameter type-id='80f4b756' name='name' filepath='fs/proc/generic.c' line='689' column='1'/>
+        <parameter type-id='d077e929' name='parent' filepath='fs/proc/generic.c' line='689' column='1'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
     </abi-instr>
     <abi-instr version='1.0' address-size='64' path='fs/proc/meminfo.c' language='LANG_C89'>
       <array-type-def dimensions='1' type-id='447da2ae' size-in-bits='192' id='d371d064'>
@@ -89391,6 +89408,11 @@
         <parameter type-id='7359adad' name='timeout' filepath='kernel/sched/completion.c' line='224' column='1'/>
         <return type-id='bd54fe1a'/>
       </function-decl>
+      <function-decl name='wait_for_completion_killable_timeout' mangled-name='wait_for_completion_killable_timeout' filepath='kernel/sched/completion.c' line='261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wait_for_completion_killable_timeout'>
+        <parameter type-id='389faaf7' name='x' filepath='kernel/sched/completion.c' line='261' column='1'/>
+        <parameter type-id='7359adad' name='timeout' filepath='kernel/sched/completion.c' line='262' column='1'/>
+        <return type-id='bd54fe1a'/>
+      </function-decl>
       <function-decl name='try_wait_for_completion' mangled-name='try_wait_for_completion' filepath='kernel/sched/completion.c' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='try_wait_for_completion'>
         <parameter type-id='389faaf7' name='x' filepath='kernel/sched/completion.c' line='280' column='1'/>
         <return type-id='b50a4934'/>
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
new file mode 100644
index 000000000000..39e7e1905b82
--- /dev/null
+++ b/android/abi_gki_aarch64_oplus
@@ -0,0 +1,205 @@
+[abi_whitelist]
+# commonly used symbols
+  alloc_workqueue
+  __arch_copy_from_user
+  __arch_copy_to_user
+  arm64_const_caps_ready
+  __cfi_slowpath
+  __check_object_size
+  __class_create
+  class_destroy
+  cpu_hwcap_keys
+  cpu_hwcaps
+  delayed_work_timer_fn
+  destroy_workqueue
+  device_create
+  device_destroy
+  devm_kfree
+  devm_kmalloc
+  disable_irq_nosync
+  enable_irq
+  finish_wait
+  gpiod_direction_output_raw
+  gpiod_get_raw_value
+  gpio_to_desc
+  init_timer_key
+  init_wait_entry
+  kfree
+  __kmalloc
+  kmalloc_caches
+  kmem_cache_alloc_trace
+  kobject_create_and_add
+  ktime_get
+  __list_add_valid
+  memcpy
+  memset
+  module_layout
+  msleep
+  __mutex_init
+  mutex_lock
+  mutex_unlock
+  of_find_property
+  of_property_read_variable_u32_array
+  PDE_DATA
+  prepare_to_wait_event
+  printk
+  proc_create
+  proc_create_data
+  proc_mkdir
+  __put_task_struct
+  queue_delayed_work_on
+  regulator_set_voltage
+  remove_proc_entry
+  schedule_timeout
+  seq_printf
+  seq_read
+  simple_open
+  simple_read_from_buffer
+  single_open
+  single_release
+  snprintf
+  sprintf
+  sscanf
+  __stack_chk_fail
+  __stack_chk_guard
+  strcmp
+  strcpy
+  strlcat
+  strlen
+  strncmp
+  strncpy
+  strstr
+  sysfs_create_group
+  sysfs_remove_group
+  usleep_range
+
+# required by oplus_project.ko
+  __ioremap
+  iounmap
+  kimage_vaddr
+  of_find_node_by_name
+
+# required by sec_drivers_s6sy791.ko
+  __const_udelay
+  i2c_del_driver
+  i2c_register_driver
+  strlcpy
+  vfree
+  vzalloc
+
+# required by oplus_lcd.ko
+  alloc_chrdev_region
+  blocking_notifier_call_chain
+  blocking_notifier_chain_register
+  blocking_notifier_chain_unregister
+  cdev_add
+  cdev_del
+  cdev_init
+  drm_atomic_commit
+  drm_atomic_get_crtc_state
+  drm_atomic_state_alloc
+  __drm_atomic_state_free
+  drm_crtc_vblank_count
+  drm_crtc_vblank_get
+  drm_crtc_vblank_put
+  drm_crtc_vblank_waitqueue
+  drm_crtc_wait_one_vblank
+  drm_dev_dbg
+  drm_dev_printk
+  drm_modeset_lock_all
+  drm_modeset_unlock_all
+  kernel_kobj
+  kmemdup
+  kobject_put
+  kthread_create_on_node
+  kthread_flush_worker
+  __kthread_init_worker
+  kthread_queue_work
+  kthread_stop
+  kthread_worker_fn
+  mipi_dsi_dcs_set_display_brightness
+  mipi_dsi_dcs_write
+  mod_delayed_work_on
+  module_put
+  __msecs_to_jiffies
+  refcount_dec_and_test_checked
+  regulator_get_voltage
+  scnprintf
+  sysfs_create_link
+  sysfs_remove_link
+  try_module_get
+  unregister_chrdev_region
+  __usecs_to_jiffies
+  wake_up_process
+
+# required by oplus_tp_project.ko
+  param_ops_string
+
+# required by oplus_sensor.ko
+  of_get_next_child
+  of_property_count_elems_of_size
+  __platform_driver_register
+
+# required by oplus_touch_comon.ko
+  cancel_delayed_work
+  cancel_delayed_work_sync
+  cancel_work_sync
+  complete
+  _dev_err
+  devm_free_irq
+  devm_gpio_request
+  devm_input_allocate_device
+  devm_pinctrl_get
+  devm_request_threaded_irq
+  disable_irq
+  drm_panel_notifier_register
+  dump_stack
+  flush_workqueue
+  free_irq
+  gpiod_to_irq
+  hrtimer_active
+  hrtimer_cancel
+  hrtimer_init
+  hrtimer_start_range_ns
+  i2c_transfer
+  __init_waitqueue_head
+  input_event
+  input_free_device
+  input_mt_init_slots
+  input_mt_report_slot_state
+  input_register_device
+  input_set_abs_params
+  int_sqrt
+  irq_set_irq_wake
+  irq_to_desc
+  __kfifo_alloc
+  kstrtoint
+  ktime_get_real_ts64
+  __list_del_entry_valid
+  of_count_phandle_with_args
+  of_drm_find_panel
+  of_get_named_gpio_flags
+  of_parse_phandle
+  of_property_read_string
+  of_property_read_variable_u8_array
+  pinctrl_lookup_state
+  pm_qos_add_request
+  pm_qos_update_request
+  queue_work_on
+  _raw_spin_lock_irqsave
+  _raw_spin_unlock_irqrestore
+  regulator_count_voltages
+  regulator_disable
+  regulator_enable
+  regulator_get
+  regulator_put
+  regulator_set_load
+  release_firmware
+  remove_proc_subtree
+  request_firmware
+  rtc_time64_to_tm
+  spi_sync
+  strcat
+  system_wq
+  wait_for_completion_killable_timeout
+  __wake_up
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index 02fee05f1e98..2b13bdb31245 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -10,6 +10,7 @@ android/abi_gki_aarch64_db845c
 android/abi_gki_aarch64_exynos
 android/abi_gki_aarch64_goldfish
 android/abi_gki_aarch64_hikey960
+android/abi_gki_aarch64_oplus
 android/abi_gki_aarch64_qcom
 android/abi_gki_aarch64_sunxi
 android/abi_gki_aarch64_unisoc