From e67b2d58c8ab02f7a2b06ee6a668b572fed59f65 Mon Sep 17 00:00:00 2001 From: Ivan Vecera Date: Sun, 15 Dec 2024 18:20:39 +0100 Subject: [PATCH] grus: Switch to py extract utils Change-Id: I10a2bc3472ff3294823a4565f80b558c6c14d9ec --- extract-files.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ extract-files.sh | 21 --------------------- setup-makefiles.py | 1 + setup-makefiles.sh | 15 --------------- 4 files changed, 46 insertions(+), 36 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..8a48a2c --- /dev/null +++ b/extract-files.py @@ -0,0 +1,45 @@ +#!/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_fixup_remove, + lib_fixups, + lib_fixups_user_type, +) + +from extract_utils.main import ( + ExtractUtils, + ExtractUtilsModule, +) + +namespace_imports = [ + 'hardware/qcom/sdm845', + 'hardware/xiaomi', + 'vendor/xiaomi/sdm710-common', +] + +def lib_fixup_vendor_suffix(lib: str, partition: str, *args, **kwargs): + return f'{lib}_{partition}' if partition == 'vendor' else None + +lib_fixups: lib_fixups_user_type = { + **lib_fixups, +} + +module = ExtractUtilsModule( + 'grus', + 'xiaomi', + lib_fixups=lib_fixups, + namespace_imports=namespace_imports, +) + +if __name__ == '__main__': + utils = ExtractUtils.device_with_common(module, 'sdm710-common', module.vendor) + utils.run() diff --git a/extract-files.sh b/extract-files.sh deleted file mode 100755 index 36d49f9..0000000 --- a/extract-files.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2016 The CyanogenMod Project -# Copyright (C) 2017-2020 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=grus -export DEVICE_COMMON=sdm710-common -export VENDOR=xiaomi - -"./../../${VENDOR}/${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 2a68bf1..0000000 --- a/setup-makefiles.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2016 The CyanogenMod Project -# Copyright (C) 2017-2020 The LineageOS Project -# -# SPDX-License-Identifier: Apache-2.0 -# - -set -e - -export DEVICE=grus -export DEVICE_COMMON=sdm710-common -export VENDOR=xiaomi - -"./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"