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

sky: Switch to python extract-utils

Browse Source 
Change-Id: I2bc74ab7331516a6e7958fd9238b0e7d2e66872c
This commit is contained in:
Arian
2024-10-06 18:31:15 +02:00
committed by Lostark13
parent cce595dc56
commit 3f6532152f
5 changed files with 157 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
extract-files.py Normal file
View File

@@ -0,0 +1,146 @@
#!/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
extract_utils.tools.DEFAULT_PATCHELF_VERSION = '0_17_2'
from extract_utils.fixups_blob import (
blob_fixup,
blob_fixups_user_type,
)
from extract_utils.fixups_lib import (
lib_fixup_remove,
lib_fixup_remove_arch_suffix,
lib_fixup_remove_proto_version_suffix,
lib_fixup_vendorcompat,
lib_fixups_user_type,
libs_clang_rt_ubsan,
libs_proto_3_9_1,
libs_proto_21_12,
)
from extract_utils.main import (
ExtractUtils,
ExtractUtilsModule,
)
namespace_imports = [
'device/xiaomi/sky',
'hardware/qcom-caf/sm8450',
'hardware/qcom-caf/wlan',
'hardware/xiaomi',
'vendor/qcom/opensource/commonsys/display',
'vendor/qcom/opensource/commonsys-intf/display',
'vendor/qcom/opensource/dataservices',
]
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 = {
libs_clang_rt_ubsan: lib_fixup_remove_arch_suffix,
libs_proto_3_9_1: lib_fixup_vendorcompat,
libs_proto_21_12: lib_fixup_remove_proto_version_suffix,
(
'vendor.qti.hardware.dpmservice@1.0',
'vendor.qti.hardware.dpmservice@1.1',
'vendor.qti.hardware.fm@1.0',
'vendor.qti.hardware.qccsyshal@1.0',
'vendor.qti.hardware.qccsyshal@1.1',
'vendor.qti.hardware.qccvndhal@1.0',
'vendor.qti.imsrtpservice@3.0',
'vendor.qti.diaghal@1.0',
'vendor.qti.hardware.wifidisplaysession@1.0',
'com.qualcomm.qti.dpm.api@1.0',
): lib_fixup_vendor_suffix,
(
'libagm',
'libagmclient',
'libagmmixer',
'libar-pal',
'libpalclient',
'libsndcardparser',
'libwpa_client',
'vendor.qti.hardware.pal@1.0-impl',
): lib_fixup_remove,
}
blob_fixups: blob_fixups_user_type = {
'system_ext/lib64/libwfdmmsrc_system.so': blob_fixup()
.add_needed('libgui_shim.so'),
'system_ext/lib64/libwfdnative.so': blob_fixup()
.add_needed('libinput_shim.so'),
'system_ext/lib64/libwfdservice.so': blob_fixup()
.replace_needed(
'android.media.audio.common.types-V2-cpp.so',
'android.media.audio.common.types-V3-cpp.so',
),
(
'vendor/bin/hw/android.hardware.security.keymint-service-qti',
'vendor/lib64/libqtikeymint.so',
): blob_fixup()
.replace_needed(
'android.hardware.security.keymint-V1-ndk_platform.so',
'android.hardware.security.keymint-V1-ndk.so',
)
.replace_needed(
'android.hardware.security.secureclock-V1-ndk_platform.so',
'android.hardware.security.secureclock-V1-ndk.so',
)
.replace_needed(
'android.hardware.security.sharedsecret-V1-ndk_platform.so',
'android.hardware.security.sharedsecret-V1-ndk.so',
)
.add_needed('android.hardware.security.rkp-V1-ndk.so'),
'vendor/bin/qcc-trd': blob_fixup()
.replace_needed(
'libgrpc++_unsecure.so', 'libgrpc++_unsecure_prebuilt.so'
),
'vendor/lib64/hw/fingerprint.fpc.default.so': blob_fixup()
.replace_needed(
'com.fingerprints.extension@1.0.so', 'com.fingerprints.extension@1.0_vendor.so'
),
'vendor/lib64/libcamximageformatutils.so': blob_fixup()
.replace_needed(
'vendor.qti.hardware.display.config-V2-ndk_platform.so', 'vendor.qti.hardware.display.config-V2-ndk.so'
),
'vendor/lib64/libhme.so': blob_fixup()
.replace_needed(
'libstdc++.so', 'libstdc++_vendor.so'
),
'vendor/lib64/libimp.so': blob_fixup()
.replace_needed(
'libjnigraphics.so', 'libjnigraphics_prebuilt.so'
),
'vendor/lib64/libopencv_java4.so': blob_fixup()
.replace_needed(
'libjnigraphics.so', 'libjnigraphics_prebuilt.so'
),
'vendor/etc/media_codecs_ravelin.xml': blob_fixup()
.regex_replace('.+media_codecs_(google_audio|google_c2|google_telephony|vendor_audio).+\n', ''),
'vendor/etc/seccomp_policy/atfwd@2.0.policy': blob_fixup()
.add_line_if_missing('gettid: 1'),
'vendor/etc/seccomp_policy/c2audio.vendor.ext-arm64.policy': blob_fixup()
.add_line_if_missing('setsockopt: 1'),
'vendor/etc/seccomp_policy/wfdhdcphalservice.policy': blob_fixup()
.add_line_if_missing('gettid: 1'),
'vendor/lib64/vendor.libdpmframework.so': blob_fixup()
.add_needed('libhidlbase_shim.so'),
} # fmt: skip
module = ExtractUtilsModule(
'sky',
'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()

188
extract-files.sh
View File

@@ -1,188 +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=sky
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 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
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/libwfdmmsrc_system.so)
grep -q "libgui_shim.so" "${2}" || "${PATCHELF}" --add-needed "libgui_shim.so" "${2}"
;;
system_ext/lib64/libwfdnative.so)
grep -q "libinput_shim.so" "${2}" || "${PATCHELF}" --add-needed "libinput_shim.so" "${2}"
;;
system_ext/lib64/libwfdservice.so)
"${PATCHELF}" --replace-needed "android.media.audio.common.types-V2-cpp.so" "android.media.audio.common.types-V3-cpp.so" "${2}"
;;
vendor/bin/hw/android.hardware.security.keymint-service-qti|vendor/lib64/libqtikeymint.so)
"${PATCHELF}" --add-needed "android.hardware.security.rkp-V1-ndk.so" "${2}"
"${PATCHELF}" --replace-needed "android.hardware.security.keymint-V1-ndk_platform.so" "android.hardware.security.keymint-V1-ndk.so" "${2}"
"${PATCHELF}" --replace-needed "android.hardware.security.secureclock-V1-ndk_platform.so" "android.hardware.security.secureclock-V1-ndk.so" "${2}"
"${PATCHELF}" --replace-needed "android.hardware.security.sharedsecret-V1-ndk_platform.so" "android.hardware.security.sharedsecret-V1-ndk.so" "${2}"
;;
vendor/bin/qcc-trd)
"${PATCHELF}" --replace-needed "libgrpc++_unsecure.so" "libgrpc++_unsecure_prebuilt.so" "${2}"
;;
vendor/bin/sensors.qti)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/bin/sensors-qesdk)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/etc/seccomp_policy/atfwd@2.0.policy)
grep -q "gettid: 1" "${2}" || echo "gettid: 1" >> "${2}"
;;
vendor/etc/seccomp_policy/c2audio.vendor.ext-arm64.policy)
grep -q "setsockopt: 1" "${2}" || echo "setsockopt: 1" >> "${2}"
;;
vendor/etc/seccomp_policy/wfdhdcphalservice.policy)
grep -q "gettid: 1" "${2}" || echo "gettid: 1" >> "${2}"
;;
vendor/etc/media_codecs_ravelin.xml)
sed -i -E '/media_codecs_(google_audio|google_c2|google_telephony|vendor_audio)/d' "${2}"
;;
vendor/lib64/hw/fingerprint.fpc.default.so)
"${PATCHELF}" --replace-needed "com.fingerprints.extension@1.0.so" "com.fingerprints.extension@1.0_vendor.so" "${2}"
;;
vendor/lib64/libcamximageformatutils.so)
"${PATCHELF}" --replace-needed "vendor.qti.hardware.display.config-V2-ndk_platform.so" "vendor.qti.hardware.display.config-V2-ndk.so" "${2}"
;;
vendor/lib64/libqshcamera.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib64/libsnsdiaglog.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib64/sensors.touch.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib64/sensors.ssc.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib64/libssc.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib64/libsensorcal.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib64/mediadrm/libwvdrmengine.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib64/libsnsapi.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib64/libssccalapi@2.0.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib64/libgnss.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib64/libwvhidl.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib/libsnsdiaglog.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib/sensors.touch.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib/sensors.ssc.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib/libssc.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib/libsensorcal.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib/mediadrm/libwvdrmengine.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib/libsnsapi.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib/libssccalapi@2.0.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib/libgnss.so)
"${PATCHELF}" --replace-needed "libprotobuf-cpp-lite-3.9.1.so" "libprotobuf-cpp-full-3.9.1.so" "${2}"
;;
vendor/lib64/libgrpc++_unsecure_prebuilt.so)
"${PATCHELF}" --set-soname "libgrpc++_unsecure_prebuilt.so" "${2}"
;;
vendor/lib64/libhme.so)
"${PATCHELF}" --replace-needed "libstdc++.so" "libstdc++_vendor.so" "${2}"
;;
vendor/lib64/libimp.so)
"${PATCHELF}" --replace-needed "libjnigraphics.so" "libjnigraphics_prebuilt.so" "${2}"
;;
vendor/lib64/libjnigraphics_prebuilt.so)
"${PATCHELF}" --set-soname "libjnigraphics_prebuilt.so" "${2}"
;;
vendor/lib64/libopencv_java4.so)
"${PATCHELF}" --replace-needed "libjnigraphics.so" "libjnigraphics_prebuilt.so" "${2}"
;;
vendor/lib64/vendor.libdpmframework.so)
"${PATCHELF}" --add-needed "libhidlbase_shim.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"

20
proprietary-files.txt
View File

@@ -585,7 +585,7 @@ system_ext/lib64/vendor.qti.diaghal@1.0.so
vendor/bin/diag-router
vendor/etc/init/vendor.qti.diag.rc
vendor/etc/vintf/manifest/vendor.qti.diag.hal.service.xml
vendor/lib64/vendor.qti.diaghal@1.0.so;MODULE=vendor.qti.diaghal@1.0-vendor
vendor/lib64/vendor.qti.diaghal@1.0.so;MODULE_SUFFIX=_vendor
# Display HDR - from ingot-user 14 UKQ1.231121.127 127 release-keys
vendor/lib64/libgame_enhance.so|4432e47d990e98edb141becc345a92d03df26bf4
@@ -673,15 +673,15 @@ vendor/bin/vendor.dpmd
vendor/etc/dpm_vndr/vendor.dpm.conf
vendor/etc/init/dpmQmiMgr.rc
vendor/etc/init/vendor.dpmd.rc
vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so;MODULE=com.qualcomm.qti.dpm.api@1.0-vendor
vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so;MODULE_SUFFIX=_vendor
vendor/lib64/libdpmqmihal.so
vendor/lib64/vendor.libdpmctmgr.so
vendor/lib64/vendor.libdpmfdmgr.so
vendor/lib64/vendor.libdpmframework.so
vendor/lib64/vendor.libdpmtcm.so
vendor/lib64/vendor.libmwqemiptablemgr.so
vendor/lib64/vendor.qti.hardware.dpmservice@1.0.so;MODULE=vendor.qti.hardware.dpmservice@1.0-vendor
vendor/lib64/vendor.qti.hardware.dpmservice@1.1.so;MODULE=vendor.qti.hardware.dpmservice@1.1-vendor
vendor/lib64/vendor.qti.hardware.dpmservice@1.0.so;MODULE_SUFFIX=_vendor
vendor/lib64/vendor.qti.hardware.dpmservice@1.1.so;MODULE_SUFFIX=_vendor
# DRM
vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service
@@ -732,7 +732,7 @@ system_ext/lib64/vendor.qti.hardware.fm@1.0.so
vendor/etc/init/init.qti.fm.rc
vendor/etc/init.qti.fm.sh
vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so
vendor/lib64/vendor.qti.hardware.fm@1.0.so;MODULE=vendor.qti.hardware.fm@1.0-vendor
vendor/lib64/vendor.qti.hardware.fm@1.0.so;MODULE_SUFFIX=_vendor
# Gatekeeper
vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti
@@ -1075,10 +1075,10 @@ vendor/lib64/vendor.qti.hardware.alarm@1.0.so
# QCC
vendor/lib64/hw/vendor.qti.hardware.qccvndhal@1.0-impl.so
vendor/lib64/libgrpc++_unsecure.so:vendor/lib64/libgrpc++_unsecure_prebuilt.so
vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so;MODULE=vendor.qti.hardware.qccsyshal@1.0-vendor
vendor/lib64/vendor.qti.hardware.qccsyshal@1.1.so;MODULE=vendor.qti.hardware.qccsyshal@1.1-vendor
vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so;MODULE_SUFFIX=_vendor
vendor/lib64/vendor.qti.hardware.qccsyshal@1.1.so;MODULE_SUFFIX=_vendor
vendor/lib64/vendor.qti.hardware.qccvndhal@1.0-halimpl.so
vendor/lib64/vendor.qti.hardware.qccvndhal@1.0.so;MODULE=vendor.qti.hardware.qccvndhal@1.0-vendor
vendor/lib64/vendor.qti.hardware.qccvndhal@1.0.so;MODULE_SUFFIX=_vendor
# QCOM system daemon
vendor/bin/qcom-system-daemon
@@ -1370,7 +1370,7 @@ vendor/lib64/vendor.qti.ims.rcsuce@1.0.so
vendor/lib64/vendor.qti.ims.rcsuce@1.1.so
vendor/lib64/vendor.qti.ims.rcsuce@1.2.so
vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so
vendor/lib64/vendor.qti.imsrtpservice@3.0.so;MODULE=vendor.qti.imsrtpservice@3.0-vendor
vendor/lib64/vendor.qti.imsrtpservice@3.0.so;MODULE_SUFFIX=_vendor
# Secure element
vendor/bin/hw/vendor.qti.secure_element@1.2-service
@@ -1697,5 +1697,5 @@ vendor/lib64/libwfduibcsinkinterface_vendor.so
vendor/lib64/libwfduibcsrc_vendor.so
vendor/lib64/libwfduibcsrcinterface_vendor.so
vendor/lib64/libwfdutils_proprietary.so
vendor/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so;MODULE=vendor.qti.hardware.wifidisplaysession@1.0-vendor
vendor/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so;MODULE_SUFFIX=_vendor
vendor/lib64/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so

1
setup-makefiles.py Executable file
View File

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

86
setup-makefiles.sh
View File

@@ -1,86 +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=sky
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 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}"
function vendor_imports() {
cat << EOF >> "$1"
"device/xiaomi/sky",
"hardware/qcom-caf/sm8450",
"hardware/qcom-caf/wlan",
"hardware/xiaomi",
"vendor/qcom/opensource/commonsys/display",
"vendor/qcom/opensource/commonsys-intf/display",
"vendor/qcom/opensource/dataservices",
EOF
}
function lib_to_package_fixup_vendor_variants() {
if [ "$2" != "vendor" ]; then
return 1
fi
case "$1" in
vendor.qti.hardware.dpmservice@1.0 | \
vendor.qti.hardware.dpmservice@1.1 | \
vendor.qti.hardware.fm@1.0 | \
vendor.qti.hardware.qccsyshal@1.0 | \
vendor.qti.hardware.qccsyshal@1.1 | \
vendor.qti.hardware.qccvndhal@1.0 | \
vendor.qti.imsrtpservice@3.0 | \
vendor.qti.diaghal@1.0 | \
vendor.qti.hardware.wifidisplaysession@1.0 | \
com.qualcomm.qti.dpm.api@1.0)
echo "$1-vendor"
;;
libagm | \
libagmclient | \
libagmmixer | \
libar-pal | \
libpalclient | \
libsndcardparser | \
libwpa_client | \
vendor.qti.hardware.pal@1.0-impl)
;;
*)
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