From fa546f6de1edba50f8bbad4968fe241adb7ebe6c Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 13 Aug 2022 04:25:09 +0300 Subject: [PATCH] akita: Copy touch modules to vendor_kernel_boot Makes touch work in recovery goodix_brl_touch requires heatmap & goog_touch_interface symbols too Co-authored-by: Nicholas Lim Co-authored-by: LuK1337 Change-Id: Iaa5a158af827732b13ab79b60bed2f319ce56391 --- BoardConfigLineage.mk | 6 ++++++ akita/Android.bp | 11 +++++++++++ akita/device-lineage.mk | 4 ++++ akita/init.recovery.touch.rc | 4 ++++ modules.blocklist.vendor_kernel_boot | 3 +++ modules.load.vendor_kernel_boot | 3 +++ 6 files changed, 31 insertions(+) create mode 100644 akita/Android.bp create mode 100644 akita/init.recovery.touch.rc create mode 100644 modules.blocklist.vendor_kernel_boot create mode 100644 modules.load.vendor_kernel_boot diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk index df4e949..3f3f6f0 100644 --- a/BoardConfigLineage.mk +++ b/BoardConfigLineage.mk @@ -5,3 +5,9 @@ # DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/aam_compatibility_matrix.xml + +# Kernel modules +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist.vendor_kernel_boot +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_kernel_boot)) +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW) +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW))) diff --git a/akita/Android.bp b/akita/Android.bp new file mode 100644 index 0000000..c49f4c7 --- /dev/null +++ b/akita/Android.bp @@ -0,0 +1,11 @@ +// +// SPDX-FileCopyrightText: 2024 The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +prebuilt_etc { + name: "init.recovery.akita.touch.rc", + src: "init.recovery.touch.rc", + sub_dir: "init", + recovery: true, +} diff --git a/akita/device-lineage.mk b/akita/device-lineage.mk index d2d9821..616dfa6 100644 --- a/akita/device-lineage.mk +++ b/akita/device-lineage.mk @@ -12,3 +12,7 @@ PRODUCT_PACKAGES += \ PixelDisplayServiceOverlayAkita TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop + +# Init +PRODUCT_PACKAGES += \ + init.recovery.akita.touch.rc diff --git a/akita/init.recovery.touch.rc b/akita/init.recovery.touch.rc new file mode 100644 index 0000000..58e0aa8 --- /dev/null +++ b/akita/init.recovery.touch.rc @@ -0,0 +1,4 @@ +on init + insmod /lib/modules/heatmap.ko + insmod /lib/modules/goog_touch_interface.ko + insmod /lib/modules/goodix_brl_touch.ko diff --git a/modules.blocklist.vendor_kernel_boot b/modules.blocklist.vendor_kernel_boot new file mode 100644 index 0000000..fccefde --- /dev/null +++ b/modules.blocklist.vendor_kernel_boot @@ -0,0 +1,3 @@ +blocklist heatmap +blocklist goog_touch_interface +blocklist goodix_brl_touch diff --git a/modules.load.vendor_kernel_boot b/modules.load.vendor_kernel_boot new file mode 100644 index 0000000..6e1cc88 --- /dev/null +++ b/modules.load.vendor_kernel_boot @@ -0,0 +1,3 @@ +extra/private/google-modules/touch/common/heatmap.ko +extra/private/google-modules/touch/common/goog_touch_interface.ko +extra/private/google-modules/touch/goodix/goodix_brl_touch.ko