From 3791c4308181f833bd1567ac77e7ab7644b7a137 Mon Sep 17 00:00:00 2001 From: armdebug Date: Wed, 16 Jul 2025 02:35:30 -0400 Subject: [PATCH] raphael: Migrate to py extract utils Change-Id: I70f8b5bb9322a4ffca21bebe9d9b47fb934c8a79 --- extract-files.py | 51 ++++++++++++++++++++++++++++++++++++++++++++++ extract-files.sh | 47 ------------------------------------------ setup-makefiles.py | 1 + setup-makefiles.sh | 30 --------------------------- 4 files changed, 52 insertions(+), 77 deletions(-) create mode 100755 extract-files.py delete mode 100755 extract-files.sh create mode 100755 setup-makefiles.py delete mode 100755 setup-makefiles.sh diff --git a/extract-files.py b/extract-files.py new file mode 100755 index 0000000..259985a --- /dev/null +++ b/extract-files.py @@ -0,0 +1,51 @@ +#!/usr/bin/env -S PYTHONPATH=../../../tools/extract-utils python3 +# +# SPDX-FileCopyrightText: 2024 The LineageOS Project +# SPDX-License-Identifier: Apache-2.0 +# + +from extract_utils.fixups_blob import ( + blob_fixup, + blob_fixups_user_type, +) +from extract_utils.fixups_lib import ( + lib_fixups, +) +from extract_utils.main import ( + ExtractUtils, + ExtractUtilsModule, +) + +blob_fixups: blob_fixups_user_type = { + 'vendor/etc/init/init.batterysecret.rc': blob_fixup() + .regex_replace('.*seclabel u:r:batterysecret:s0\n', ''), + 'vendor/lib/hw/audio.primary.raphael.so': blob_fixup() + .binary_regex_replace( + b'/vendor/lib/liba2dpoffload.so', + b'liba2dpoffload_raphael.so\x00\x00\x00\x00', + ), + 'vendor/lib64/camera/components/com.qti.node.watermark.so': blob_fixup() + .add_needed('libpiex_shim.so'), +} # fmt: skip + +namespace_imports = [ + 'hardware/qcom-caf/common/libqti-perfd-client', + 'hardware/qcom-caf/sm8150', + 'hardware/xiaomi', + 'vendor/qcom/opensource/display', + 'vendor/xiaomi/sm8150-common', +] + +module = ExtractUtilsModule( + 'raphael', + 'xiaomi', + blob_fixups=blob_fixups, + lib_fixups=lib_fixups, + namespace_imports=namespace_imports, +) + +if __name__ == '__main__': + utils = ExtractUtils.device_with_common( + module, 'sm8150-common', module.vendor + ) + utils.run() diff --git a/extract-files.sh b/extract-files.sh deleted file mode 100755 index 01c6480..0000000 --- a/extract-files.sh +++ /dev/null @@ -1,47 +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/etc/init/init.batterysecret.rc) - [ "$2" = "" ] && return 0 - sed -i "/seclabel u:r:batterysecret:s0/d" "${2}" - ;; - vendor/lib/hw/audio.primary.raphael.so) - [ "$2" = "" ] && return 0 - sed -i "s|/vendor/lib/liba2dpoffload\.so|liba2dpoffload_raphael\.so\x00\x00\x00\x00|g" "${2}" - ;; - vendor/lib64/camera/components/com.qti.node.watermark.so) - [ "$2" = "" ] && return 0 - grep -q "libpiex_shim.so" "${2}" || "${PATCHELF}" --add-needed "libpiex_shim.so" "${2}" - ;; - *) - return 1 - ;; - esac - - return 0 -} - -function blob_fixup_dry() { - blob_fixup "$1" "" -} - -# 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=raphael -export DEVICE_COMMON=sm8150-common -export VENDOR=xiaomi -export VENDOR_COMMON=${VENDOR} - -"./../../${VENDOR_COMMON}/${DEVICE_COMMON}/extract-files.sh" "$@" diff --git a/setup-makefiles.py b/setup-makefiles.py new file mode 100755 index 0000000..32947cf --- /dev/null +++ b/setup-makefiles.py @@ -0,0 +1 @@ +#!./extract-files.py --regenerate_makefiles diff --git a/setup-makefiles.sh b/setup-makefiles.sh deleted file mode 100755 index c022b77..0000000 --- a/setup-makefiles.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -# -# SPDX-FileCopyrightText: 2016 The CyanogenMod Project -# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project -# SPDX-License-Identifier: Apache-2.0 -# - -function vendor_imports() { - cat <>"$1" - "hardware/qcom-caf/common/libqti-perfd-client", - "hardware/qcom-caf/sm8150", - "hardware/xiaomi", - "vendor/qcom/opensource/display", -EOF -} - -# 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=raphael -export DEVICE_COMMON=sm8150-common -export VENDOR=xiaomi -export VENDOR_COMMON=${VENDOR} - -"./../../${VENDOR_COMMON}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"