Evolution-X-Devices/device_xiaomi_fleur
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fleur: Switch to python extract-utils

Browse Source 
* Fix libshim_sensors patches while at it.

Signed-off-by: nisel <96194200+nisel11@users.noreply.github.com>
This commit is contained in:
nisel
2024-12-29 17:10:10 +02:00
committed by claxten10
parent a84b47d4c4
commit 8bf72a05c9
4 changed files with 102 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
extract-files.py Executable file
View File

@@ -0,0 +1,101 @@
#!/usr/bin/env -S PYTHONPATH=../../../tools/extract-utils python3
#
# SPDX-FileCopyrightText: 2024 The LineageOS Project
# SPDX-License-Identifier: Apache-2.0
#
import extract_utils.tools
from extract_utils.fixups_blob import (
blob_fixup,
blob_fixups_user_type,
)
from extract_utils.fixups_lib import (
lib_fixups,
lib_fixups_user_type,
)
from extract_utils.main import (
ExtractUtils,
ExtractUtilsModule,
)
extract_utils.tools.DEFAULT_PATCHELF_VERSION = '0_17_2'
namespace_imports = [
'device/xiaomi/fleur',
'hardware/mediatek',
'hardware/mediatek/libmtkperf_client',
'hardware/xiaomi',
]
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,
(
'vendor.mediatek.hardware.videotelephony@1.0',
): lib_fixup_vendor_suffix,
}
blob_fixups: blob_fixups_user_type = {
'system_ext/lib64/libsink.so': blob_fixup()
.add_needed('libshim_sink.so'),
'system_ext/lib64/libsource.so': blob_fixup()
.add_needed('libui_shim.so'),
'vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b': blob_fixup()
.add_needed('libstagefright_foundation-v33.so')
.replace_needed('libavservices_minijail_vendor.so', 'libavservices_minijail.so'),
('vendor/lib64/hw/android.hardware.gnss-impl-mediatek.so', 'vendor/bin/hw/android.hardware.gnss-service.mediatek'): blob_fixup()
.replace_needed('android.hardware.gnss-V1-ndk_platform.so', 'android.hardware.gnss-V1-ndk.so'),
('vendor/bin/mnld', 'vendor/lib64/libaalservice.so', 'vendor/lib64/libcam.utils.sensorprovider.so'): blob_fixup()
.add_needed('libshim_sensors.so'),
'vendor/etc/init/android.hardware.media.c2@1.2-mediatek-64b.rc': blob_fixup()
.regex_replace('mediatek', 'mediatek-64b'),
'vendor/etc/init/android.hardware.neuralnetworks@1.3-service-mtk-neuron.rc': blob_fixup()
.regex_replace('start', 'enable'),
'vendor/etc/camera/camerabooster.json': blob_fixup()
.regex_replace('"sea"', '"fleur"'),
'vendor/lib64/hw/vendor.mediatek.hardware.pq@2.15-impl.so': blob_fixup()
.replace_needed('libutils.so', 'libutils-v32.so'),
('vendor/lib64/hw/android.hardware.camera.provider@2.6-impl-mediatek.so', 'vendor/lib64/libmtkcam_stdutils.so'): blob_fixup()
.replace_needed('libutils.so', 'libutils-v32.so'),
'vendor/lib64/libvendor.goodix.hardware.biometrics.fingerprint@2.1.so': blob_fixup()
.replace_needed('libhidlbase.so', 'libhidlbase-v32.so'),
('vendor/lib64/vendor.mediatek.hardware.power@1.1.so', 'vendor/lib64/vendor.mediatek.hardware.power@2.0.so'): blob_fixup()
.add_needed('libshim_power.so'),
'vendor/lib64/libmnl.so': blob_fixup()
.add_needed('libcutils.so'),
(
'vendor/lib/libteei_daemon_vfs.so',
'vendor/lib64/libteei_daemon_vfs.so',
'vendor/lib64/libSQLiteModule_VER_ALL.so',
'vendor/lib64/lib3a.flash.so',
'vendor/lib64/lib3a.ae.stat.so',
'vendor/lib64/lib3a.sensors.color.so',
'vendor/lib64/lib3a.sensors.flicker.so',
'vendor/lib64/libaaa_ltm.so',
): blob_fixup()
.add_needed('liblog.so'),
}
module = ExtractUtilsModule(
'fleur',
'xiaomi',
blob_fixups=blob_fixups,
lib_fixups=lib_fixups,
namespace_imports=namespace_imports,
check_elf=True,
)
if __name__ == '__main__':
utils = ExtractUtils.device(module)
utils.run()

123
extract-files.sh
View File

@@ -1,123 +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
DEVICE=fleur
VENDOR=xiaomi
# 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 PATCHELF_VERSION=0_17_2
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
KANG=
SECTION=
while [ "${#}" -gt 0 ]; do
case "${1}" in
-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
system_ext/lib64/libsink.so)
"${PATCHELF}" --add-needed "libshim_sink.so" "$2"
;;
system_ext/lib64/libsource.so)
"${PATCHELF}" --add-needed "libui_shim.so" "${2}"
;;
vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b)
"$PATCHELF" --add-needed "libstagefright_foundation-v33.so" "$2"
"${PATCHELF}" --replace-needed "libavservices_minijail_vendor.so" "libavservices_minijail.so" "${2}"
;;
vendor/bin/hw/android.hardware.gnss-service.mediatek|\
vendor/lib64/hw/android.hardware.gnss-impl-mediatek.so)
"$PATCHELF" --replace-needed "android.hardware.gnss-V1-ndk_platform.so" "android.hardware.gnss-V1-ndk.so" "$2"
;;
vendor/bin/mnld|\
vendor/lib64/libaalservice.so)
"$PATCHELF" --add-needed "libshim_sensors.so" "$2"
;;
vendor/etc/init/android.hardware.media.c2@1.2-mediatek-64b.rc)
[ "$2" = "" ] && return 0
sed -i 's/mediatek/mediatek-64b/' "$2"
;;
vendor/etc/init/android.hardware.neuralnetworks@1.3-service-mtk-neuron.rc)
sed -i 's/start/enable/' "$2"
;;
vendor/etc/camera/camerabooster.json)
sed -i 's/"sea"/"fleur"/' "$2"
;;
vendor/lib64/hw/vendor.mediatek.hardware.pq@2.15-impl.so)
"$PATCHELF" --replace-needed "libutils.so" "libutils-v32.so" "$2"
"$PATCHELF" --add-needed "libshim_sensors.so" "$2"
;;
vendor/lib64/hw/android.hardware.camera.provider@2.6-impl-mediatek.so|\
vendor/lib64/libmtkcam_stdutils.so)
"${PATCHELF}" --replace-needed "libutils.so" "libutils-v32.so" "$2"
;;
vendor/lib64/libvendor.goodix.hardware.biometrics.fingerprint@2.1.so)
"${PATCHELF}" --replace-needed "libhidlbase.so" "libhidlbase-v32.so" "${2}"
;;
vendor/lib64/vendor.mediatek.hardware.power@1.1.so|\
vendor/lib64/vendor.mediatek.hardware.power@2.0.so)
"${PATCHELF}" --add-needed "libshim_power.so" "${2}"
;;
vendor/lib64/libmnl.so)
"${PATCHELF}" --add-needed "libcutils.so" "${2}"
;;
vendor/lib*/libteei_daemon_vfs.so|\
vendor/lib64/libSQLiteModule_VER_ALL.so|\
vendor/lib64/lib3a.flash.so|\
vendor/lib64/lib3a.ae.stat.so|\
vendor/lib64/lib3a.sensors.color.so|\
vendor/lib64/lib3a.sensors.flicker.so|\
vendor/lib64/libaaa_ltm.so)
"${PATCHELF}" --add-needed "liblog.so" "${2}"
;;
esac
}
# Initialize the helper
setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
"${MY_DIR}/setup-makefiles.sh"

1
setup-makefiles.py Executable file
View File

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

66
setup-makefiles.sh
View File

@@ -1,66 +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
DEVICE=fleur
VENDOR=xiaomi
# 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/xiaomi/fleur",
"hardware/mediatek",
"hardware/mediatek/libmtkperf_client",
"hardware/xiaomi"
EOF
}
function lib_to_package_fixup_vendor_variants() {
if [ "$2" != "vendor" ]; then
return 1
fi
case "$1" in
vendor.mediatek.hardware.videotelephony@1.0)
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
setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
# Warning headers and guards
write_headers
write_makefiles "${MY_DIR}/proprietary-files.txt" true
# Finish
write_footers