dumpling: Switch to Touch AIDL

Change-Id: I92a19fedb9ea482616c2e3d550e30b69d2a3a5c7

device.mk

@@ -39,7 +39,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Touch
 PRODUCT_PACKAGES += \
-    vendor.lineage.touch@1.0-service.oneplus
+    vendor.lineage.touch-service.oneplus
 
 # Wifi
 PRODUCT_PACKAGES += \

evolution.dependencies

@@ -0,0 +1,14 @@
+[
+  {
+    "repository": "device_oneplus_msm8998-common",
+    "target_path": "device/oneplus/msm8998-common"
+  },
+  {
+    "repository": "vendor_oneplus_dumpling",
+    "target_path": "vendor/oneplus/dumpling"
+  },
+  {
+    "repository": "vendor_oneplus_msm8998-common",
+    "target_path": "vendor/oneplus/msm8998-common"
+  }
+]

extract-files.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env -S PYTHONPATH=../../../tools/extract-utils python3
+#
+# SPDX-FileCopyrightText: 2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+from extract_utils.main import (
+    ExtractUtils,
+    ExtractUtilsModule,
+)
+from extract_utils.fixups_blob import (
+    blob_fixup,
+    blob_fixups_user_type,
+)
+
+namespace_imports = [
+    'hardware/oneplus',
+    'hardware/qcom-caf/msm8998',
+    'vendor/oneplus/msm8998-common',
+]
+
+blob_fixups: blob_fixups_user_type = {
+    (
+        'vendor/lib/hw/fingerprint.goodix.so',
+        'vendor/lib64/hw/fingerprint.goodix.so',
+    ): blob_fixup()
+        .binary_regex_replace(b'\x00goodix.fingerprint\x00', b'\x00fingerprint\x00\x00\x00\x00\x00\x00\x00\x00'),
+}  # fmt: skip
+
+module = ExtractUtilsModule(
+    'dumpling',
+    'oneplus',
+    blob_fixups=blob_fixups,
+    namespace_imports=namespace_imports,
+    add_firmware_proprietary_file=True,
+)
+
+if __name__ == '__main__':
+    utils = ExtractUtils.device_with_common(
+        module, 'msm8998-common', module.vendor
+    )
+    utils.run()

extract-files.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-function blob_fixup() {
-    case "${1}" in
-        vendor/lib/hw/fingerprint.goodix.so | vendor/lib64/hw/fingerprint.goodix.so)
-            [ "$2" = "" ] && return 0
-            sed -i "s|\x00goodix.fingerprint\x00|\x00fingerprint\x00\x00\x00\x00\x00\x00\x00\x00|" "${2}"
-            ;;
-        *)
-            return 1
-            ;;
-    esac
-
-    return 0
-}
-
-# If we're being sourced by the common script that we called,
-# stop right here. No need to go down the rabbit hole.
-if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
-    return
-fi
-
-set -e
-
-export DEVICE=dumpling
-export DEVICE_COMMON=msm8998-common
-export VENDOR=oneplus
-export VENDOR_COMMON=${VENDOR}
-
-"./../../${VENDOR_COMMON}/${DEVICE_COMMON}/extract-files.sh" "$@"

lineage.dependencies

@@ -1,6 +0,0 @@
-[
-  {
-    "repository": "android_device_oneplus_msm8998-common",
-    "target_path": "device/oneplus/msm8998-common"
-  }
-]

proprietary-files.txt

@@ -63,6 +63,6 @@ vendor/etc/oneplus5T_vstab_db_720p_video_1_30fps.config
 vendor/lib64/libgf_ca.so|a085af23228a871d67a6aa3122561f742a7bb822
 
 # Fingerprint sensor
-vendor/lib64/hw/goodix.fingerprint.msm8998.so:vendor/lib64/hw/fingerprint.msm8998.so
+vendor/lib64/hw/goodix.fingerprint.msm8998.so:vendor/lib64/hw/fingerprint.msm8998.so;FIX_SONAME
 vendor/lib64/libgf_hal.so
 vendor/lib64/libgoodixfingerprintd_binder.so

sepolicy/vendor/file_contexts

@@ -3,4 +3,4 @@
 /sys/devices/soc/soc:goodix_fp/proximity_state                  u:object_r:sysfs_proximity:s0
 
 # Touch
-/(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch@1\.0-service\.oneplus    u:object_r:hal_touch_oneplus_msm8998_exec:s0
+/(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch-service\.oneplus    u:object_r:hal_touch_oneplus_msm8998_exec:s0

setup-makefiles.py

@@ -0,0 +1 @@
+#!./extract-files.py --regenerate_makefiles

setup-makefiles.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-# If we're being sourced by the common script that we called,
-# stop right here. No need to go down the rabbit hole.
-if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
-    return
-fi
-
-set -e
-
-export DEVICE=dumpling
-export DEVICE_COMMON=msm8998-common
-export VENDOR=oneplus
-export VENDOR_COMMON=${VENDOR}
-
-"./../../${VENDOR_COMMON}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"