universal9830: Switch to py extract-utils

5 files changed, 215 insertions, 341 deletions

diff --git a/extract-files.py b/extract-files.py
new file mode 100755
index 0000000..4543d8a
--- /dev/null
+++ b/extract-files.py
@@ -0,0 +1,95 @@
+#!/usr/bin/env -S PYTHONPATH=../../../tools/extract-utils python3
+#
+# SPDX-FileCopyrightText: 2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+from extract_utils.file import File
+from extract_utils.fixups_blob import (
+    BlobFixupCtx,
+    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,
+)
+from extract_utils.tools import (
+    llvm_objdump_path,
+)
+from extract_utils.utils import (
+    run_cmd,
+)
+
+namespace_imports = [
+    'device/samsung/universal9830-common',
+    'hardware/samsung',
+    'hardware/samsung_slsi-linaro/exynos',
+    'hardware/samsung_slsi-linaro/graphics',
+    'vendor/samsung/universal9830-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,
+    (
+        'libuuid',
+        'libsecril-client',
+    ): lib_fixup_vendor_suffix,
+}
+
+
+blob_fixups: blob_fixups_user_type = {
+    ('vendor/bin/vaultkeeperd', 'vendor/lib64/libvkservice.so'): blob_fixup()
+        .binary_regex_replace(b'ro.factory.factory_binary', b'ro.vendor.factory_binary\x00'),
+    'vendor/lib64/libbayergdccore.so': blob_fixup()
+        .replace_needed('libOpenCL.so', 'libGLES_mali.so'),
+    'vendor/lib64/libkeymaster_helper.so': blob_fixup()
+        .replace_needed('libcrypto.so', 'libcrypto-v33.so'),
+    'vendor/lib64/libnpuc_backend.so': blob_fixup()
+        .add_needed('liblog.so')
+        .add_needed('libnpuc_cmdq.so'),
+    'vendor/lib64/libnpuc_graph.so': blob_fixup()
+        .add_needed('libnpuc_common.so'),
+    (
+        'vendor/lib64/libnpuc_common.so',
+        'vendor/lib64/libnpuc_controller.so',
+        'vendor/lib64/libnpuc_frontend.so',
+        'vendor/lib64/libnpuc_template.so',
+    ): blob_fixup()
+        .add_needed('liblog.so'),
+    'vendor/lib64/libeden_ud_gpu.so': blob_fixup()
+        .replace_needed('libOpenCL.so', 'libGLES_mali.so')
+        .add_needed('libeden_ud_cpu.so'),
+    'vendor/lib64/libsec-ril.so': blob_fixup()
+        .sig_replace('15 aa 08 00 40 f9 e3 03 14 aa', '15 aa 08 00 40 f9 03 00 80 d2'),
+    'vendor/lib64/libsensorlistener.so': blob_fixup()
+        .add_needed('libsensorndkbridge_shim.so'),
+    'vendor/lib64/libskeymaster4device.so': blob_fixup()
+        .replace_needed('libcrypto.so', 'libcrypto-v33.so')
+        .add_needed('libshim_crypto.so'),
+    'vendor/lib/libwvhidl.so': blob_fixup()
+        .replace_needed('libprotobuf-cpp-lite-3.9.1.so', 'libprotobuf-cpp-full-3.9.1.so')
+        .add_needed('libcrypto_shim.so'),
+}  # fmt: skip
+
+module = ExtractUtilsModule(
+    'universal9830-common',
+    'samsung',
+    blob_fixups=blob_fixups,
+    lib_fixups=lib_fixups,
+    namespace_imports=namespace_imports,
+)
+
+if __name__ == '__main__':
+    utils = ExtractUtils.device(module)
+    utils.run()
diff --git a/extract-files.sh b/extract-files.sh
deleted file mode 100755
index a921ff7..0000000
--- a/extract-files.sh
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2023 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-# Load extract_utils and do some sanity checks
-MY_DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
-
-ANDROID_ROOT="${MY_DIR}/../../.."
-
-export TARGET_ENABLE_CHECKELF=true
-
-HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
-if [ ! -f "${HELPER}" ]; then
-    echo "Unable to find helper script at ${HELPER}"
-    exit 1
-fi
-source "${HELPER}"
-
-# Default to sanitizing the vendor folder before extraction
-CLEAN_VENDOR=true
-
-ONLY_COMMON=
-ONLY_TARGET=
-KANG=
-SECTION=
-
-while [ "${#}" -gt 0 ]; do
-    case "${1}" in
-        --only-common )
-                ONLY_COMMON=true
-                ;;
-        --only-target )
-                ONLY_TARGET=true
-                ;;
-        -n | --no-cleanup )
-                CLEAN_VENDOR=false
-                ;;
-        -k | --kang )
-                KANG="--kang"
-                ;;
-        -s | --section )
-                SECTION="${2}"; shift
-                CLEAN_VENDOR=false
-                ;;
-        * )
-                SRC="${1}"
-                ;;
-    esac
-    shift
-done
-
-if [ -z "${SRC}" ]; then
-    SRC="adb"
-fi
-
-function blob_fixup() {
-    case "${1}" in
-        vendor/bin/vaultkeeperd|vendor/lib64/libvkservice.so)
-            sed -i 's/ro\.factory\.factory_binary/ro.vendor.factory_binary\x00/g' "${2}"
-            ;;
-        vendor/lib64/libbayergdccore.so)
-            "${PATCHELF}" --replace-needed libOpenCL.so libGLES_mali.so "${2}"
-            ;;
-        vendor/lib64/libnpuc_backend.so)
-            "${PATCHELF}" --add-needed libnpuc_cmdq.so "${2}"
-            "${PATCHELF}" --add-needed liblog.so "${2}"
-            ;;
-        vendor/lib64/libnpuc_common.so|vendor/lib64/libnpuc_controller.so|vendor/lib64/libnpuc_frontend.so|vendor/lib64/libnpuc_template.so)
-            "${PATCHELF}" --add-needed liblog.so "${2}"
-            ;;
-        vendor/lib64/libnpuc_graph.so)
-            "${PATCHELF}" --add-needed libnpuc_common.so "${2}"
-            ;;
-        vendor/lib64/libeden_ud_gpu.so)
-            "${PATCHELF}" --replace-needed libOpenCL.so libGLES_mali.so "${2}"
-            "${PATCHELF}" --add-needed libeden_ud_cpu.so "${2}"
-            ;;
-        vendor/lib*/libsec-ril*.so)
-            xxd -p -c0 "${2}" | sed "s/600e40f9820c805224008052e10315aa080040f9e30314aa/600e40f9820c805224008052e10315aa080040f9030080d2/g" | xxd -r -p > "${2}".patched
-            mv "${2}".patched "${2}"
-            ;;
-        vendor/lib*/libsensorlistener.so)
-            "${PATCHELF}" --add-needed libsensorndkbridge_shim.so "${2}"
-            ;;
-        vendor/lib64/libkeymaster_helper.so)
-            "${PATCHELF}" --replace-needed libcrypto.so libcrypto-v33.so "${2}"
-            ;;
-        vendor/lib*/libskeymaster4device.so)
-            "${PATCHELF}" --replace-needed libcrypto.so libcrypto-v33.so "${2}"
-            "${PATCHELF}" --add-needed libshim_crypto.so "${2}"
-            ;;
-        vendor/lib*/libwvhidl.so)
-            "${PATCHELF}" --replace-needed libprotobuf-cpp-lite-3.9.1.so libprotobuf-cpp-full-3.9.1.so "${2}"
-            "${PATCHELF}" --add-needed libcrypto_shim.so "${2}"
-            ;;
-    esac
-}
-
-if [ -z "${ONLY_TARGET}" ]; then
-    # Initialize the helper for common device
-    setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true "${CLEAN_VENDOR}"
-
-    extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-fi
-
-if [ -z "${ONLY_COMMON}" ] && [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then
-    # Reinitialize the helper for device
-    source "${MY_DIR}/../${DEVICE}/extract-files.sh"
-    setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
-
-    extract "${MY_DIR}/../${DEVICE}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-fi
-
-"${MY_DIR}/setup-makefiles.sh"
diff --git a/proprietary-files.txt b/proprietary-files.txt
index b75f482..4eb1082 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -2,17 +2,17 @@
 # Vendor security patch level 2024-03-01
 
 # Audio
--vendor/lib/libSamsungPostProcessConvertor.so
--vendor/lib/lib_SoundAlive_SRC384_ver320.so
--vendor/lib/lib_soundaliveresampler.so
--vendor/lib64/libSamsungPostProcessConvertor.so
--vendor/lib64/lib_SoundAlive_SRC384_ver320.so
--vendor/lib64/lib_soundaliveresampler.so
+vendor/lib/libSamsungPostProcessConvertor.so
+vendor/lib/lib_SoundAlive_SRC384_ver320.so
+vendor/lib/lib_soundaliveresampler.so
+vendor/lib64/libSamsungPostProcessConvertor.so
+vendor/lib64/lib_SoundAlive_SRC384_ver320.so
+vendor/lib64/lib_soundaliveresampler.so
 
 # Audio (Dolby Atmos)
--vendor/lib/libprofileparamstorage.so
--vendor/lib/libsecaudiocoreutils.so
--vendor/lib/libspatializerparamstorage.so
+vendor/lib/libprofileparamstorage.so
+vendor/lib/libsecaudiocoreutils.so
+vendor/lib/libspatializerparamstorage.so
 
 # Audio (Firmware)
 vendor/firmware/APSV_AUDIO_SLSI.bin
@@ -65,109 +65,109 @@ vendor/firmware/txse3.bin
 vendor/firmware/volumemonitor.bin
 
 # Camera
--vendor/lib64/libSEF.quram.so
--vendor/lib64/libbayergdccore.so
--vendor/lib64/libexynoscamera_fakefusion.so
--vendor/lib64/libexynoscamera_fakefusion_plugin.so
--vendor/lib64/libexynoscamera_plugin.so
--vendor/lib64/libexynoscamera_plugin_utils.so
--vendor/lib64/libhwjsqz.so
--vendor/lib64/libsensorlistener.so
--vendor/lib64/libuniapi.so
--vendor/lib64/libuniplugin.so
--vendor/lib64/libvpl.so
--vendor/lib64/vendor.samsung.hardware.thermal@1.0.so
+vendor/lib64/libSEF.quram.so
+vendor/lib64/libbayergdccore.so
+vendor/lib64/libexynoscamera_fakefusion.so
+vendor/lib64/libexynoscamera_fakefusion_plugin.so
+vendor/lib64/libexynoscamera_plugin.so
+vendor/lib64/libexynoscamera_plugin_utils.so
+vendor/lib64/libhwjsqz.so
+vendor/lib64/libsensorlistener.so
+vendor/lib64/libuniapi.so
+vendor/lib64/libuniplugin.so
+vendor/lib64/libvpl.so
+vendor/lib64/vendor.samsung.hardware.thermal@1.0.so
 
 # Exynos Multi-Format Codec (MFC) Firmware
 vendor/firmware/mfc_fw.bin
 
 # Fingerprint
--vendor/lib64/libbauthserver.so
--vendor/lib64/libbauthtzcommon.so
--vendor/lib64/libegis_fp_normal_sensor_test.so
--vendor/lib64/libgf_in_system_lib.so
--vendor/lib64/libqfp_sensortest.so
--vendor/lib64/libsynaFpSensorTestNwd.so
+vendor/lib64/libbauthserver.so
+vendor/lib64/libbauthtzcommon.so
+vendor/lib64/libegis_fp_normal_sensor_test.so
+vendor/lib64/libgf_in_system_lib.so
+vendor/lib64/libqfp_sensortest.so
+vendor/lib64/libsynaFpSensorTestNwd.so
 
 # Gatekeeper
--vendor/lib64/hw/gatekeeper.exynos990.so
+vendor/lib64/hw/gatekeeper.exynos990.so
 
 # GPS
 vendor/bin/hw/gps.sh
--vendor/bin/hw/lhd
--vendor/bin/hw/vendor.samsung.hardware.gnss@2.1-service
+vendor/bin/hw/lhd
+vendor/bin/hw/vendor.samsung.hardware.gnss@2.1-service
 vendor/etc/gnss/gps.cer
 vendor/etc/init/vendor.samsung.hardware.gnss@2.1-service.rc
 vendor/etc/sensor/lhd.conf
--vendor/lib64/hw/android.hardware.gnss@2.1-impl.so;FIX_SONAME
--vendor/lib64/hw/flp.default.so;FIX_SONAME
--vendor/lib64/hw/gps.default.so;FIX_SONAME
--vendor/lib64/hw/vendor.samsung.hardware.gnss@2.1-impl.so
--vendor/lib64/vendor.samsung.hardware.gnss@2.0.so
--vendor/lib64/vendor.samsung.hardware.gnss@2.1.so
+vendor/lib64/hw/android.hardware.gnss@2.1-impl.so;FIX_SONAME
+vendor/lib64/hw/flp.default.so;FIX_SONAME
+vendor/lib64/hw/gps.default.so;FIX_SONAME
+vendor/lib64/hw/vendor.samsung.hardware.gnss@2.1-impl.so
+vendor/lib64/vendor.samsung.hardware.gnss@2.0.so
+vendor/lib64/vendor.samsung.hardware.gnss@2.1.so
 
 # Graphics
--vendor/lib/egl/libGLES_mali.so;SYMLINK=vendor/lib/libOpenCL.so;SYMLINK=vendor/lib/libOpenCL.so.1;SYMLINK=vendor/lib/libOpenCL.so.1.1
--vendor/lib/hw/vulkan.mali.so
--vendor/lib64/egl/libGLES_mali.so;SYMLINK=vendor/lib64/libOpenCL.so;SYMLINK=vendor/lib64/libOpenCL.so.1;SYMLINK=vendor/lib64/libOpenCL.so.1.1
--vendor/lib64/hw/vulkan.mali.so
+vendor/lib/egl/libGLES_mali.so;SYMLINK=vendor/lib/libOpenCL.so;SYMLINK=vendor/lib/libOpenCL.so.1;SYMLINK=vendor/lib/libOpenCL.so.1.1
+vendor/lib/hw/vulkan.mali.so
+vendor/lib64/egl/libGLES_mali.so;SYMLINK=vendor/lib64/libOpenCL.so;SYMLINK=vendor/lib64/libOpenCL.so.1;SYMLINK=vendor/lib64/libOpenCL.so.1.1
+vendor/lib64/hw/vulkan.mali.so
 
 # Hotword Enrollment
 system/system_ext/framework/com.android.hotwordenrollment.common.util.jar:system_ext/framework/com.android.hotwordenrollment.common.util.jar
 system/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
 
 # Keymaster
--vendor/bin/hw/android.hardware.keymaster@4.0_strongbox-service
+vendor/bin/hw/android.hardware.keymaster@4.0_strongbox-service
 vendor/etc/init/android.hardware.keymaster@4.0_strongbox-service.rc
--vendor/lib64/libkeymaster_helper.so
--vendor/lib64/libskeymaster4device.so
+vendor/lib64/libkeymaster_helper.so
+vendor/lib64/libskeymaster4device.so
 
 # Neural Networks
--vendor/bin/hw/android.hardware.neuralnetworks@1.3-service.eden-drv
--vendor/bin/hw/vendor.samsung_slsi.hardware.eden_runtime@1.0-service
+vendor/bin/hw/android.hardware.neuralnetworks@1.3-service.eden-drv
+vendor/bin/hw/vendor.samsung_slsi.hardware.eden_runtime@1.0-service
 vendor/etc/eden/gpu/eden_kernel_64.bin
 vendor/etc/init/android.hardware.neuralnetworks@1.3-service.eden-drv.rc
 vendor/etc/init/vendor.samsung_slsi.hardware.eden_runtime@1.0-service.rc
--vendor/lib64/libcommon.so
--vendor/lib64/libcrane_compiler.so
--vendor/lib64/libeden_model.so
--vendor/lib64/libeden_nn.so
--vendor/lib64/libeden_nn_on_vendor.so
--vendor/lib64/libeden_osal.so
--vendor/lib64/libeden_profiler.so
--vendor/lib64/libeden_rt.so
--vendor/lib64/libeden_rt_stub_vendor.edensdk.samsung.so
--vendor/lib64/libeden_ud_cpu.so
--vendor/lib64/libeden_ud_dsp.so
--vendor/lib64/libeden_ud_gpu.so
--vendor/lib64/libeden_ud_npu.so
--vendor/lib64/libeden_wrapper.so
--vendor/lib64/libeden_wrapper_sdk.so
--vendor/lib64/libeden_xtool.so
--vendor/lib64/libenn_dsp_dal.so
--vendor/lib64/libenn_dsp_fw_graph_parser.so
--vendor/lib64/libenn_dsp_kernels_cpu.so
--vendor/lib64/libgraphgen_ann_import.so
--vendor/lib64/libgraphgen_ann_nnc.so
--vendor/lib64/libgraphgen_api.so
--vendor/lib64/libgraphgen_export.so
--vendor/lib64/libgraphgen_import.so
--vendor/lib64/libgraphgen_intermediate_process.so
--vendor/lib64/libgraphgen_misc.so
--vendor/lib64/libgraphgen_network.so
--vendor/lib64/libir.so
--vendor/lib64/libnpu_compiler.so
--vendor/lib64/libnpuc_api.so
--vendor/lib64/libnpuc_backend.so
--vendor/lib64/libnpuc_cmdq.so
--vendor/lib64/libnpuc_common.so
--vendor/lib64/libnpuc_controller.so
--vendor/lib64/libnpuc_frontend.so
--vendor/lib64/libnpuc_graph.so
--vendor/lib64/libnpuc_template.so
--vendor/lib64/libsait_npu_compiler.so
--vendor/lib64/vendor.samsung_slsi.hardware.eden_runtime@1.0-impl.so
--vendor/lib64/vendor.samsung_slsi.hardware.eden_runtime@1.0.so
+vendor/lib64/libcommon.so
+vendor/lib64/libcrane_compiler.so
+vendor/lib64/libeden_model.so
+vendor/lib64/libeden_nn.so
+vendor/lib64/libeden_nn_on_vendor.so
+vendor/lib64/libeden_osal.so
+vendor/lib64/libeden_profiler.so
+vendor/lib64/libeden_rt.so
+vendor/lib64/libeden_rt_stub_vendor.edensdk.samsung.so
+vendor/lib64/libeden_ud_cpu.so
+vendor/lib64/libeden_ud_dsp.so
+vendor/lib64/libeden_ud_gpu.so
+vendor/lib64/libeden_ud_npu.so
+vendor/lib64/libeden_wrapper.so
+vendor/lib64/libeden_wrapper_sdk.so
+vendor/lib64/libeden_xtool.so
+vendor/lib64/libenn_dsp_dal.so
+vendor/lib64/libenn_dsp_fw_graph_parser.so
+vendor/lib64/libenn_dsp_kernels_cpu.so
+vendor/lib64/libgraphgen_ann_import.so
+vendor/lib64/libgraphgen_ann_nnc.so
+vendor/lib64/libgraphgen_api.so
+vendor/lib64/libgraphgen_export.so
+vendor/lib64/libgraphgen_import.so
+vendor/lib64/libgraphgen_intermediate_process.so
+vendor/lib64/libgraphgen_misc.so
+vendor/lib64/libgraphgen_network.so
+vendor/lib64/libir.so
+vendor/lib64/libnpu_compiler.so
+vendor/lib64/libnpuc_api.so
+vendor/lib64/libnpuc_backend.so
+vendor/lib64/libnpuc_cmdq.so
+vendor/lib64/libnpuc_common.so
+vendor/lib64/libnpuc_controller.so
+vendor/lib64/libnpuc_frontend.so
+vendor/lib64/libnpuc_graph.so
+vendor/lib64/libnpuc_template.so
+vendor/lib64/libsait_npu_compiler.so
+vendor/lib64/vendor.samsung_slsi.hardware.eden_runtime@1.0-impl.so
+vendor/lib64/vendor.samsung_slsi.hardware.eden_runtime@1.0.so
 
 # Neural Networks (Firmware)
 vendor/firmware/NPU_NFD_P4.7.tflite
@@ -189,12 +189,12 @@ vendor/firmware/vts.bin
 vendor/firmware/yuv2bayer.bin
 
 # Proca
--vendor/bin/vendor.samsung.hardware.security.proca@2.0-service
+vendor/bin/vendor.samsung.hardware.security.proca@2.0-service
 
 # RIL
--vendor/bin/cass
--vendor/bin/cbd
--vendor/bin/hw/rild
+vendor/bin/cass
+vendor/bin/cbd
+vendor/bin/hw/rild
 vendor/etc/init/cass.rc
 vendor/etc/init/init.baseband.rc
 vendor/etc/init/init.vendor.rilchip.rc
@@ -202,42 +202,42 @@ vendor/etc/init/init.vendor.rilcommon.rc
 vendor/etc/plmn_delta.bin
 vendor/etc/plmn_delta_attaio.bin
 vendor/etc/plmn_delta_usagsm.bin
--vendor/lib/libsecril-client.so;MODULE_SUFFIX=_vendor
--vendor/lib/libsemnativecarrierfeature.so
--vendor/lib64/libengmode_client.so
--vendor/lib64/libfloatingfeature.so
--vendor/lib64/libril_sem.so
--vendor/lib64/libsec-ril.so
--vendor/lib64/libsecril-client.so;MODULE_SUFFIX=_vendor
--vendor/lib64/libSemDataProps.so
--vendor/lib64/libsemnativecarrierfeature.so
--vendor/lib64/libSemTelephonyProps.so
--vendor/lib64/libvkmanager_vendor.so
--vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so
--vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so
--vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so
+vendor/lib/libsecril-client.so;MODULE_SUFFIX=_vendor
+vendor/lib/libsemnativecarrierfeature.so
+vendor/lib64/libengmode_client.so
+vendor/lib64/libfloatingfeature.so
+vendor/lib64/libril_sem.so
+vendor/lib64/libsec-ril.so
+vendor/lib64/libsecril-client.so;MODULE_SUFFIX=_vendor
+vendor/lib64/libSemDataProps.so
+vendor/lib64/libsemnativecarrierfeature.so
+vendor/lib64/libSemTelephonyProps.so
+vendor/lib64/libvkmanager_vendor.so
+vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so
+vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so
+vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so
 
 
 # Secnative
--vendor/lib/libsecnativefeature.so
--vendor/lib64/libsecnativefeature.so
+vendor/lib/libsecnativefeature.so
+vendor/lib64/libsecnativefeature.so
 
 # Secure Element
--vendor/bin/hw/android.hardware.secure_element@1.2-service
+vendor/bin/hw/android.hardware.secure_element@1.2-service
 vendor/etc/init/android.hardware.secure_element@1.2-service.rc
 vendor/etc/libse-gto-hal.conf
--vendor/lib64/android.hardware.secure_element-impl-gto.so
--vendor/lib64/libsec_semRil.so
+vendor/lib64/android.hardware.secure_element-impl-gto.so
+vendor/lib64/libsec_semRil.so
 
 # Sensors
--vendor/lib64/sensors.flicker.so
--vendor/lib64/sensors.grip.so
+vendor/lib64/sensors.flicker.so
+vendor/lib64/sensors.grip.so
 
 # Teegris
--vendor/bin/tzdaemon
--vendor/bin/tzts_daemon
--vendor/lib64/libteecl.so
--vendor/lib64/libuuid.so;MODULE_SUFFIX=_vendor
+vendor/bin/tzdaemon
+vendor/bin/tzts_daemon
+vendor/lib64/libteecl.so
+vendor/lib64/libuuid.so;MODULE_SUFFIX=_vendor
 vendor/tee/00000000-0000-0000-0000-000000010081
 vendor/tee/00000000-0000-0000-0000-000000020081
 vendor/tee/00000000-0000-0000-0000-000048444350
@@ -256,13 +256,13 @@ vendor/tee/ffffffff-0000-0000-0000-000000000030
 vendor/tee/tui/resolution_common/ID00000100
 
 # VaultKeeper
--vendor/bin/vaultkeeperd
+vendor/bin/vaultkeeperd
 vendor/etc/init/vaultkeeper_common.rc
--vendor/lib64/libstork_shared.so
--vendor/lib64/libvkservice.so
+vendor/lib64/libstork_shared.so
+vendor/lib64/libvkservice.so
 
 # Widevine
--vendor/bin/hw/android.hardware.drm@1.3-service.widevine
+vendor/bin/hw/android.hardware.drm@1.3-service.widevine
 vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc
 vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml
--vendor/lib/libwvhidl.so
+vendor/lib/libwvhidl.so
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 4293e29..0000000
--- a/setup-makefiles.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2023 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# Load extract_utils and do some sanity checks
-MY_DIR="${BASH_SOURCE%/*}"
-if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
-
-ANDROID_ROOT="${MY_DIR}/../../.."
-
-HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
-if [ ! -f "${HELPER}" ]; then
-    echo "Unable to find helper script at ${HELPER}"
-    exit 1
-fi
-source "${HELPER}"
-
-function vendor_imports() {
-    cat <<EOF >>"$1"
-	"device/samsung/universal9830-common",
-	"hardware/samsung",
-	"hardware/samsung_slsi-linaro/exynos",
-	"hardware/samsung_slsi-linaro/graphics",
-EOF
-}
-
-function lib_to_package_fixup_vendor_variants() {
-    if [ "$2" != "vendor" ]; then
-        return 1
-    fi
-
-    case "$1" in
-        libuuid | \
-           libsecril-client)
-            echo "$1_vendor"
-            ;;
-        *)
-            return 1
-            ;;
-    esac
-}
-
-function lib_to_package_fixup() {
-    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" ||
-        lib_to_package_fixup_proto_3_9_1 "$1" ||
-        lib_to_package_fixup_vendor_variants "$@"
-}
-
-# Initialize the helper for common
-setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true
-
-# Warning headers and guards
-write_headers "r8s x1s x1slte z3s"
-
-# The standard common blobs
-write_makefiles "${MY_DIR}/proprietary-files.txt" true
-
-###################################################################################################
-# CUSTOM PART START                                                                               #
-###################################################################################################
-
-###################################################################################################
-# CUSTOM PART END                                                                                 #
-###################################################################################################
-
-# Finish
-write_footers
-
-if [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt" ]; then
-    # Reinitialize the helper for device
-    setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false
-
-    # Warning headers and guards
-    write_headers
-
-    # The standard device blobs
-    write_makefiles "${MY_DIR}/../${DEVICE}/proprietary-files.txt" true
-
-    # Finish
-    write_footers
-fi