From 73eb901c0d1b26b98fefad26c0833cc35031fea1 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 13 Aug 2022 04:25:09 +0300 Subject: [PATCH] caimito: Copy touch modules to vendor_kernel_boot Makes touch work in recovery syna_touch requires qbt_handler, heatmap & goog_touch_interface symbols Co-authored-by: Nicholas Lim Co-authored-by: LuK1337 Change-Id: Iaa5a158af827732b13ab79b60bed2f319ce56391 --- BoardConfigLineage.mk | 6 ++++++ caiman/Android.bp | 11 +++++++++++ caiman/device-lineage.mk | 4 ++++ caiman/init.recovery.touch.rc | 5 +++++ komodo/Android.bp | 11 +++++++++++ komodo/device-lineage.mk | 4 ++++ komodo/init.recovery.touch.rc | 5 +++++ modules.blocklist.vendor_kernel_boot | 4 ++++ modules.load.vendor_kernel_boot | 4 ++++ tokay/Android.bp | 11 +++++++++++ tokay/device-lineage.mk | 4 ++++ tokay/init.recovery.touch.rc | 5 +++++ 12 files changed, 74 insertions(+) create mode 100644 caiman/Android.bp create mode 100644 caiman/init.recovery.touch.rc create mode 100644 komodo/Android.bp create mode 100644 komodo/init.recovery.touch.rc create mode 100644 modules.blocklist.vendor_kernel_boot create mode 100644 modules.load.vendor_kernel_boot create mode 100644 tokay/Android.bp create mode 100644 tokay/init.recovery.touch.rc diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk index eadedb98..4c3a41bb 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/caiman/Android.bp b/caiman/Android.bp new file mode 100644 index 00000000..149e012d --- /dev/null +++ b/caiman/Android.bp @@ -0,0 +1,11 @@ +// +// SPDX-FileCopyrightText: 2024 The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +prebuilt_etc { + name: "init.recovery.caiman.touch.rc", + src: "init.recovery.touch.rc", + sub_dir: "init", + recovery: true, +} diff --git a/caiman/device-lineage.mk b/caiman/device-lineage.mk index 36b93db5..f8d99df5 100644 --- a/caiman/device-lineage.mk +++ b/caiman/device-lineage.mk @@ -12,3 +12,7 @@ PRODUCT_PACKAGES += \ PixelDisplayServiceOverlayCaiman TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop + +# Init +PRODUCT_PACKAGES += \ + init.recovery.caiman.touch.rc diff --git a/caiman/init.recovery.touch.rc b/caiman/init.recovery.touch.rc new file mode 100644 index 00000000..b8cb63a3 --- /dev/null +++ b/caiman/init.recovery.touch.rc @@ -0,0 +1,5 @@ +on init + insmod /lib/modules/qbt_handler.ko + insmod /lib/modules/heatmap.ko + insmod /lib/modules/goog_touch_interface.ko + insmod /lib/modules/syna_touch.ko diff --git a/komodo/Android.bp b/komodo/Android.bp new file mode 100644 index 00000000..ca28ce7e --- /dev/null +++ b/komodo/Android.bp @@ -0,0 +1,11 @@ +// +// SPDX-FileCopyrightText: 2024 The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +prebuilt_etc { + name: "init.recovery.komodo.touch.rc", + src: "init.recovery.touch.rc", + sub_dir: "init", + recovery: true, +} diff --git a/komodo/device-lineage.mk b/komodo/device-lineage.mk index 0d7c69c8..ce2b62e8 100644 --- a/komodo/device-lineage.mk +++ b/komodo/device-lineage.mk @@ -12,3 +12,7 @@ PRODUCT_PACKAGES += \ PixelDisplayServiceOverlayKomodo TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop + +# Init +PRODUCT_PACKAGES += \ + init.recovery.komodo.touch.rc diff --git a/komodo/init.recovery.touch.rc b/komodo/init.recovery.touch.rc new file mode 100644 index 00000000..b8cb63a3 --- /dev/null +++ b/komodo/init.recovery.touch.rc @@ -0,0 +1,5 @@ +on init + insmod /lib/modules/qbt_handler.ko + insmod /lib/modules/heatmap.ko + insmod /lib/modules/goog_touch_interface.ko + insmod /lib/modules/syna_touch.ko diff --git a/modules.blocklist.vendor_kernel_boot b/modules.blocklist.vendor_kernel_boot new file mode 100644 index 00000000..593f95bc --- /dev/null +++ b/modules.blocklist.vendor_kernel_boot @@ -0,0 +1,4 @@ +blocklist qbt_handler +blocklist heatmap +blocklist goog_touch_interface +blocklist syna_touch diff --git a/modules.load.vendor_kernel_boot b/modules.load.vendor_kernel_boot new file mode 100644 index 00000000..6ad872b6 --- /dev/null +++ b/modules.load.vendor_kernel_boot @@ -0,0 +1,4 @@ +extra/private/google-modules/fingerprint/qcom/qfs4008/qbt_handler.ko +extra/private/google-modules/touch/common/heatmap.ko +extra/private/google-modules/touch/common/goog_touch_interface.ko +extra/private/google-modules/touch/synaptics/syna_gtd/syna_touch.ko diff --git a/tokay/Android.bp b/tokay/Android.bp new file mode 100644 index 00000000..787986bf --- /dev/null +++ b/tokay/Android.bp @@ -0,0 +1,11 @@ +// +// SPDX-FileCopyrightText: 2024 The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +prebuilt_etc { + name: "init.recovery.tokay.touch.rc", + src: "init.recovery.touch.rc", + sub_dir: "init", + recovery: true, +} diff --git a/tokay/device-lineage.mk b/tokay/device-lineage.mk index 7833465f..e40b0f94 100644 --- a/tokay/device-lineage.mk +++ b/tokay/device-lineage.mk @@ -12,3 +12,7 @@ PRODUCT_PACKAGES += \ PixelDisplayServiceOverlayTokay TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop + +# Init +PRODUCT_PACKAGES += \ + init.recovery.tokay.touch.rc diff --git a/tokay/init.recovery.touch.rc b/tokay/init.recovery.touch.rc new file mode 100644 index 00000000..b8cb63a3 --- /dev/null +++ b/tokay/init.recovery.touch.rc @@ -0,0 +1,5 @@ +on init + insmod /lib/modules/qbt_handler.ko + insmod /lib/modules/heatmap.ko + insmod /lib/modules/goog_touch_interface.ko + insmod /lib/modules/syna_touch.ko