From c493d36e07bfd16bd8cd6dfd1b566545a975682d Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 13 Aug 2022 04:25:09 +0300 Subject: [PATCH] shusky: Copy touch modules to vendor_kernel_boot Makes touch work in recovery ftm5 & goodix_brl_touch require heatmap & goog_touch_interface symbols Co-authored-by: Nicholas Lim Co-authored-by: LuK1337 Change-Id: Iaa5a158af827732b13ab79b60bed2f319ce56391 --- BoardConfigLineage.mk | 6 ++++++ husky/Android.bp | 11 +++++++++++ husky/device-lineage.mk | 4 ++++ husky/init.recovery.touch.rc | 4 ++++ modules.blocklist.vendor_kernel_boot | 4 ++++ modules.load.vendor_kernel_boot | 4 ++++ shiba/Android.bp | 11 +++++++++++ shiba/device-lineage.mk | 4 ++++ shiba/init.recovery.touch.rc | 4 ++++ 9 files changed, 52 insertions(+) create mode 100644 husky/Android.bp create mode 100644 husky/init.recovery.touch.rc create mode 100644 modules.blocklist.vendor_kernel_boot create mode 100644 modules.load.vendor_kernel_boot create mode 100644 shiba/Android.bp create mode 100644 shiba/init.recovery.touch.rc diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk index eadedb9..4c3a41b 100644 --- a/BoardConfigLineage.mk +++ b/BoardConfigLineage.mk @@ -3,3 +3,9 @@ # SPDX-FileCopyrightText: 2021-2024 The Calyx Institute # SPDX-License-Identifier: Apache-2.0 # + +# 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/husky/Android.bp b/husky/Android.bp new file mode 100644 index 0000000..961760f --- /dev/null +++ b/husky/Android.bp @@ -0,0 +1,11 @@ +// +// SPDX-FileCopyrightText: 2024 The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +prebuilt_etc { + name: "init.recovery.husky.touch.rc", + src: "init.recovery.touch.rc", + sub_dir: "init", + recovery: true, +} diff --git a/husky/device-lineage.mk b/husky/device-lineage.mk index 8d14a87..8c2fd90 100644 --- a/husky/device-lineage.mk +++ b/husky/device-lineage.mk @@ -12,3 +12,7 @@ PRODUCT_PACKAGES += \ PixelDisplayServiceOverlayHusky TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop + +# Init +PRODUCT_PACKAGES += \ + init.recovery.husky.touch.rc diff --git a/husky/init.recovery.touch.rc b/husky/init.recovery.touch.rc new file mode 100644 index 0000000..860a674 --- /dev/null +++ b/husky/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/ftm5.ko diff --git a/modules.blocklist.vendor_kernel_boot b/modules.blocklist.vendor_kernel_boot new file mode 100644 index 0000000..2cfc14e --- /dev/null +++ b/modules.blocklist.vendor_kernel_boot @@ -0,0 +1,4 @@ +blocklist heatmap +blocklist goog_touch_interface +blocklist ftm5 +blocklist goodix_brl_touch diff --git a/modules.load.vendor_kernel_boot b/modules.load.vendor_kernel_boot new file mode 100644 index 0000000..1d750b9 --- /dev/null +++ b/modules.load.vendor_kernel_boot @@ -0,0 +1,4 @@ +extra/private/google-modules/touch/common/heatmap.ko +extra/private/google-modules/touch/common/goog_touch_interface.ko +extra/private/google-modules/touch/fts/ftm5/ftm5.ko +extra/private/google-modules/touch/goodix/goodix_brl_touch.ko diff --git a/shiba/Android.bp b/shiba/Android.bp new file mode 100644 index 0000000..952f525 --- /dev/null +++ b/shiba/Android.bp @@ -0,0 +1,11 @@ +// +// SPDX-FileCopyrightText: 2024 The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +prebuilt_etc { + name: "init.recovery.shiba.touch.rc", + src: "init.recovery.touch.rc", + sub_dir: "init", + recovery: true, +} diff --git a/shiba/device-lineage.mk b/shiba/device-lineage.mk index 7a4dec3..7492b3b 100644 --- a/shiba/device-lineage.mk +++ b/shiba/device-lineage.mk @@ -12,3 +12,7 @@ PRODUCT_PACKAGES += \ PixelDisplayServiceOverlayShiba TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop + +# Init +PRODUCT_PACKAGES += \ + init.recovery.shiba.touch.rc diff --git a/shiba/init.recovery.touch.rc b/shiba/init.recovery.touch.rc new file mode 100644 index 0000000..58e0aa8 --- /dev/null +++ b/shiba/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