diff --git a/android/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom
new file mode 100644
index 000000000000..fe665b80c4c1
--- /dev/null
+++ b/android/abi_gki_aarch64_qcom
@@ -0,0 +1,395 @@
+[abi_symbol_list]
+  alloc_io_pgtable_ops
+  alloc_workqueue
+  amba_bustype
+  __arch_copy_from_user
+  __arch_copy_to_user
+  arm64_const_caps_ready
+  __arm_smccc_smc
+  blk_mq_rq_cpu
+  bpf_trace_run5
+  bus_set_iommu
+  cancel_delayed_work_sync
+  capable
+  __cfi_slowpath_diag
+  __check_object_size
+  clk_bulk_disable
+  clk_bulk_enable
+  clk_bulk_prepare
+  clk_bulk_unprepare
+  __clk_determine_rate
+  clk_disable
+  clk_enable
+  clk_fixed_factor_ops
+  clk_fixed_rate_ops
+  clk_get
+  __clk_get_hw
+  __clk_get_name
+  clk_get_parent
+  clk_get_rate
+  clk_hw_get_flags
+  clk_hw_get_name
+  clk_hw_get_num_parents
+  clk_hw_get_parent
+  clk_hw_get_parent_by_index
+  clk_hw_get_rate
+  clk_hw_is_enabled
+  clk_hw_is_prepared
+  clk_hw_round_rate
+  __clk_is_enabled
+  __clk_mux_determine_rate_closest
+  clk_prepare
+  clk_put
+  clk_round_rate
+  clk_set_parent
+  clk_set_rate
+  clk_sync_state
+  clk_unprepare
+  __const_udelay
+  cpufreq_cpu_get
+  cpufreq_cpu_put
+  cpu_hwcap_keys
+  cpu_hwcaps
+  cpumask_next
+  cpu_number
+  __cpu_online_mask
+  __cpu_possible_mask
+  __cpu_present_mask
+  cpus_read_lock
+  cpus_read_unlock
+  debugfs_attr_read
+  debugfs_attr_write
+  debugfs_create_file
+  debugfs_create_file_unsafe
+  debugfs_lookup
+  debugfs_remove
+  delayed_work_timer_fn
+  dev_driver_string
+  _dev_err
+  dev_get_regmap
+  device_create_file
+  device_link_add
+  device_match_fwnode
+  device_property_read_u16_array
+  _dev_info
+  devm_add_action
+  devm_clk_bulk_get_all
+  devm_clk_get
+  devm_clk_hw_register
+  devm_clk_register
+  devm_free_irq
+  devm_gpiod_get_optional
+  devm_ioremap_resource
+  devm_kmalloc
+  devm_krealloc
+  devm_kstrdup
+  devm_of_clk_add_hw_provider
+  __devm_of_phy_provider_register
+  devm_phy_create
+  devm_phy_get
+  devm_pinctrl_register
+  devm_platform_ioremap_resource
+  __devm_regmap_init_mmio_clk
+  devm_regulator_get
+  devm_regulator_register
+  devm_regulator_register_notifier
+  devm_request_threaded_irq
+  __devm_reset_control_get
+  __devm_reset_control_get
+  devm_reset_controller_register
+  devm_thermal_of_cooling_device_register
+  _dev_notice
+  dev_pm_opp_add
+  dev_pm_qos_add_request
+  dev_pm_qos_remove_request
+  dev_pm_qos_update_request
+  _dev_warn
+  disable_irq
+  divider_get_val
+  divider_recalc_rate
+  divider_ro_round_rate_parent
+  divider_round_rate_parent
+  dma_alloc_attrs
+  dma_free_attrs
+  dma_map_page_attrs
+  dma_set_coherent_mask
+  dma_set_mask
+  dma_sync_single_for_cpu
+  dma_unmap_page_attrs
+  dput
+  driver_find_device
+  enable_irq
+  event_triggers_call
+  _find_first_bit
+  _find_next_bit
+  flush_work
+  free_io_pgtable_ops
+  freq_qos_add_request
+  freq_qos_update_request
+  generic_device_group
+  generic_handle_domain_irq
+  generic_iommu_put_resv_regions
+  get_cpu_device
+  gic_nonsecure_priorities
+  gpiochip_add_data_with_key
+  gpiochip_add_pin_range
+  gpiochip_generic_free
+  gpiochip_generic_request
+  gpiochip_get_data
+  gpiochip_line_is_valid
+  gpiochip_lock_as_irq
+  gpiochip_remove
+  gpiochip_unlock_as_irq
+  gpiod_set_value_cansleep
+  handle_bad_irq
+  handle_edge_irq
+  handle_fasteoi_ack_irq
+  handle_fasteoi_irq
+  handle_level_irq
+  icc_put
+  icc_set_bw
+  init_timer_key
+  iommu_alloc_resv_region
+  iommu_device_register
+  iommu_device_sysfs_add
+  iommu_device_sysfs_remove
+  iommu_device_unregister
+  iommu_dma_get_resv_regions
+  iommu_fwspec_add_ids
+  iommu_fwspec_free
+  iommu_group_ref_get
+  iommu_present
+  irq_chip_disable_parent
+  irq_chip_enable_parent
+  irq_chip_eoi_parent
+  irq_chip_mask_parent
+  irq_chip_set_affinity_parent
+  irq_chip_set_parent_state
+  irq_chip_set_type_parent
+  irq_chip_set_vcpu_affinity_parent
+  irq_chip_set_wake_parent
+  irq_chip_unmask_parent
+  irq_find_matching_fwspec
+  irq_get_irq_data
+  irq_modify_status
+  __irq_resolve_mapping
+  irq_set_irq_wake
+  is_vmalloc_addr
+  jiffies
+  kfree
+  kimage_voffset
+  __kmalloc
+  kmalloc_caches
+  kmem_cache_alloc_trace
+  kstrtobool
+  kstrtouint
+  ktime_get
+  __list_add_valid
+  __list_del_entry_valid
+  memcpy
+  memcpy
+  memset
+  memset
+  memset
+  memstart_addr
+  module_put
+  msleep
+  __mutex_init
+  __mutex_init
+  mutex_lock
+  mutex_unlock
+  no_llseek
+  nr_cpu_ids
+  of_address_to_resource
+  of_alias_get_id
+  of_clk_add_provider
+  of_clk_del_provider
+  of_clk_src_simple_get
+  of_count_phandle_with_args
+  of_device_get_match_data
+  of_device_is_compatible
+  of_dma_is_coherent
+  of_find_device_by_node
+  of_find_node_by_phandle
+  of_find_node_opts_by_path
+  of_find_property
+  of_genpd_add_provider_onecell
+  of_genpd_del_provider
+  of_get_child_by_name
+  of_get_next_available_child
+  of_get_property
+  of_get_regulator_init_data
+  of_icc_get
+  of_match_device
+  of_match_node
+  of_parse_phandle
+  of_parse_phandle_with_args
+  of_phy_simple_xlate
+  of_property_count_elems_of_size
+  of_property_match_string
+  of_property_read_string
+  of_property_read_u32_index
+  of_property_read_variable_u32_array
+  of_prop_next_u32
+  param_ops_bool
+  param_ops_int
+  pci_bus_type
+  pci_device_group
+  __per_cpu_offset
+  perf_trace_buf_alloc
+  perf_trace_run_bpf_submit
+  phy_calibrate
+  phy_exit
+  phy_init
+  phy_power_off
+  phy_power_on
+  phy_set_mode_ext
+  pinconf_generic_dt_node_to_map
+  pinctrl_dev_get_drvdata
+  pinctrl_force_default
+  pinctrl_force_sleep
+  pinctrl_utils_free_map
+  platform_bus_type
+  __platform_driver_register
+  platform_driver_unregister
+  platform_get_irq
+  platform_get_resource
+  platform_get_resource_byname
+  pm_clk_add
+  pm_clk_create
+  pm_clk_destroy
+  pm_clk_resume
+  pm_clk_suspend
+  pm_genpd_add_subdomain
+  pm_genpd_init
+  pm_genpd_remove_subdomain
+  pm_power_off
+  __pm_runtime_disable
+  pm_runtime_enable
+  pm_runtime_forbid
+  pm_runtime_force_suspend
+  __pm_runtime_idle
+  pm_runtime_no_callbacks
+  __pm_runtime_resume
+  pm_runtime_set_autosuspend_delay
+  pm_runtime_set_autosuspend_delay
+  __pm_runtime_set_status
+  __pm_runtime_suspend
+  __pm_runtime_use_autosuspend
+  preempt_schedule_notrace
+  print_hex_dump
+  print_hex_dump
+  _printk
+  _printk
+  _printk
+  _printk
+  _printk
+  put_device
+  queue_delayed_work_on
+  queue_work_on
+  ___ratelimit
+  ___ratelimit
+  rational_best_approximation
+  _raw_spin_lock_irqsave
+  _raw_spin_unlock_irqrestore
+  rdev_get_drvdata
+  register_restart_handler
+  regmap_mmio_detach_clk
+  regmap_read
+  regmap_update_bits_base
+  regmap_write
+  regulator_count_voltages
+  regulator_count_voltages
+  regulator_disable
+  regulator_enable
+  regulator_set_load
+  regulator_set_load
+  regulator_set_voltage
+  report_iommu_fault
+  reset_control_assert
+  reset_control_assert
+  reset_control_deassert
+  reset_control_deassert
+  scnprintf
+  __scsi_iterate_devices
+  seq_lseek
+  seq_printf
+  seq_puts
+  seq_read
+  seq_release
+  simple_attr_open
+  simple_attr_release
+  single_open
+  snprintf
+  snprintf
+  __stack_chk_fail
+  __stack_chk_fail
+  __stack_chk_fail
+  __stack_chk_fail
+  __stack_chk_fail
+  __stack_chk_fail
+  __stack_chk_fail
+  __stack_chk_fail
+  strcmp
+  strcpy
+  strlen
+  strscpy
+  __sw_hweight64
+  syscon_regmap_lookup_by_phandle
+  sysfs_create_group
+  trace_event_buffer_commit
+  trace_event_buffer_reserve
+  trace_event_ignore_this_pid
+  trace_event_printf
+  trace_event_raw_init
+  trace_event_reg
+  trace_handle_return
+  __tracepoint_android_vh_ufs_check_int_errors
+  __tracepoint_android_vh_ufs_compl_command
+  __tracepoint_android_vh_ufs_send_command
+  __tracepoint_android_vh_ufs_send_tm_command
+  __tracepoint_android_vh_ufs_send_uic_command
+  tracepoint_probe_register
+  tracepoint_probe_unregister
+  __tracepoint_suspend_resume
+  trace_raw_output_prep
+  try_module_get
+  __ubsan_handle_cfi_check_fail_abort
+  __ubsan_handle_cfi_check_fail_abort
+  __ubsan_handle_cfi_check_fail_abort
+  __ubsan_handle_cfi_check_fail_abort
+  __ubsan_handle_cfi_check_fail_abort
+  __ubsan_handle_cfi_check_fail_abort
+  __ubsan_handle_cfi_check_fail_abort
+  __ubsan_handle_cfi_check_fail_abort
+  __ubsan_handle_cfi_check_fail_abort
+  __ubsan_handle_cfi_check_fail_abort
+  __udelay
+  ufshcd_auto_hibern8_update
+  ufshcd_dme_get_attr
+  ufshcd_dme_set_attr
+  ufshcd_dump_regs
+  ufshcd_fixup_dev_quirks
+  ufshcd_get_local_unipro_ver
+  ufshcd_hba_stop
+  ufshcd_hold
+  ufshcd_pltfrm_init
+  ufshcd_pltfrm_shutdown
+  ufshcd_query_attr
+  ufshcd_query_descriptor_retry
+  ufshcd_query_flag
+  ufshcd_release
+  ufshcd_remove
+  ufshcd_resume_complete
+  ufshcd_runtime_resume
+  ufshcd_runtime_suspend
+  ufshcd_suspend_prepare
+  ufshcd_system_resume
+  ufshcd_system_suspend
+  ufshcd_uic_hibern8_enter
+  ufshcd_uic_hibern8_exit
+  unregister_restart_handler
+  usleep_range_state
+  usleep_range_state
+  vabits_actual
+  __warn_printk
diff --git a/build.config.msm.gki b/build.config.msm.gki
index 6b20762621a7..9ecdb7c1a517 100644
--- a/build.config.msm.gki
+++ b/build.config.msm.gki
@@ -15,11 +15,16 @@ KMI_ENFORCED=1
 
 MAKE_GOALS="modules dtbs"
 GKI_BUILD_CONFIG=common/build.config.gki.aarch64
-GKI_TRIM_NONLISTED_KMI=0
-GKI_KMI_SYMBOL_LIST_STRICT_MODE=0
 GKI_SKIP_IF_VERSION_MATCHES=1
 GKI_SKIP_CP_KERNEL_HDR=1
 
+GKI_KMI_SYMBOL_LIST=../msm-kernel/android/abi_gki_aarch64_qcom
+KMI_SYMBOL_LIST=android/abi_gki_aarch64_qcom
+GKI_TRIM_NONLISTED_KMI=${TRIM_NONLISTED_KMI:-1}
+TRIM_NONLISTED_KMI=${TRIM_NONLISTED_KMI:-1}
+GKI_KMI_ENFORCED=1
+KMI_ENFORCED=1
+
 function build_defconfig_fragments() {
 	if [[ "${VARIANT}" =~ ^(gki|consolidate)$ ]]; then
 		apply_defconfig_fragment ${KERNEL_DIR}/arch/${ARCH}/configs/vendor/${MSM_ARCH}_GKI.config vendor/${MSM_ARCH}-gki_defconfig