From 9e21e82ee16ff756b9b0532800595082ef10156e Mon Sep 17 00:00:00 2001 From: David Wronek Date: Wed, 27 Nov 2024 09:33:09 +0100 Subject: [PATCH] fixup! e3q: Initial commit --- device.mk | 8 ------ extract-files.py | 3 +- proprietary-files.txt | 65 ++++++++++++++++++++++++++++++------------- 3 files changed, 47 insertions(+), 29 deletions(-) diff --git a/device.mk b/device.mk index d62f1ba..91af1e7 100644 --- a/device.mk +++ b/device.mk @@ -70,14 +70,6 @@ PRODUCT_PACKAGES += \ libhidltransport.vendor \ libhwbinder.vendor -# Keymaster -PRODUCT_PACKAGES += \ - android.hardware.keymaster@4.1.vendor - -# Keymint -PRODUCT_PACKAGES += \ - android.hardware.hardware_keystore.xml - # Media PRODUCT_PACKAGES += \ libavservices_minijail.vendor diff --git a/extract-files.py b/extract-files.py index 8da611a..6e7bd32 100755 --- a/extract-files.py +++ b/extract-files.py @@ -58,7 +58,8 @@ blob_fixups: blob_fixups_user_type = { ('vendor/bin/hw/vendor.qti.hardware.display.composer-service', 'vendor/lib64/vendor.qti.hardware.display.composer3-V1-ndk.so'): blob_fixup() .replace_needed('android.hardware.graphics.composer3-V2-ndk.so', 'android.hardware.graphics.composer3-V3-ndk.so') .replace_needed('vendor.qti.hardware.display.config-V8-ndk.so', 'vendor.qti.hardware.display.config-V11-ndk.so'), - ('vendor/lib64/libskeymint_cli.so', 'vendor/bin/hw/android.hardware.security.keymint-service'): blob_fixup() + ('vendor/lib64/libhyper.so', 'vendor/lib64/libspukeymintdeviceutils.so', 'vendor/lib64/hw/gatekeeper.mdfpp.so', 'vendor/lib64/libcppcose_rkp.so', 'vendor/lib64/libspukeymint.so', 'vendor/lib64/libhermes.so', 'vendor/lib64/libese-grdg.so', 'vendor/lib64/libspukeymintutils.so', 'vendor/lib64/libskeymint10device.so', 'vendor/lib64/liblbs_core.so', 'vendor/lib64/liboemcrypto.so', 'vendor/lib64/libwifi-hal-qcom.so', 'vendor/lib64/libpuresoftkeymasterdevice.so', 'vendor/lib64/libpal_net_if.so', 'vendor/lib64/libsfp_sensor.so', 'vendor/lib64/libkeystore-engine-wifi-hidl.so', 'vendor/lib64/libkeymaster_portable.so', 'vendor/lib64/mediacas/libclearkeycasplugin.so', 'vendor/lib64/libqcc_sdk.so', 'vendor/lib64/libdk_vnd_service_core.so', 'vendor/lib64/libwifi-hal.so', 'vendor/lib64/libtlpd_crypto.so', 'vendor/lib64/libsec-ril.so', 'vendor/lib64/libcppbor_external.so', 'vendor/lib64/libucm_tlc_tz_esecomm.so', 'vendor/lib64/libqms.so', 'vendor/lib64/libskeymint_cli.so', 'vendor/lib64/libengmode15.so', 'vendor/lib64/libkeymaster4_1support.so', 'vendor/lib64/libizat_core.so', 'vendor/lib64/libspcom.so', 'vendor/lib64/libFaceService.so', 'vendor/lib64/uwb_uci.hal.so', 'vendor/lib64/libnicm_utils.so', 'vendor/lib64/mediadrm/libdrmclearkeyplugin.so', 'vendor/lib64/libkeymaster4support.so', 'vendor/lib64/libsdmextension.so' +): blob_fixup() .replace_needed('libcrypto.so', 'libcrypto-v33.so') .replace_needed('libcppbor_external.so', 'libcppbor.so') .add_needed('android.hardware.security.rkp-V3-ndk.so') diff --git a/proprietary-files.txt b/proprietary-files.txt index cf2c21d..2a5b7b2 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -140,6 +140,34 @@ vendor/etc/display/qdcm_calib_data_vtdr6130_amoled_qsync_video_mode_dsi_visionox vendor/etc/display/qdcm_calib_data_vtdr6130_amoled_video_mode_dsi_visionox_panel_with_DSC.json vendor/etc/display/thermallevel_to_fps.xml +# DPM +system_ext/etc/dpm/dpm.conf +vendor/etc/init/dpmQmiMgr.rc +vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so +vendor/lib64/vendor.qti.diaghal@1.0.so +vendor/lib64/vendor.qti.hardware.dpmaidlservice-V1-ndk.so +vendor/lib64/vendor.qti.hardware.dpmservice@1.0.so +vendor/lib64/vendor.qti.hardware.dpmservice@1.1.so + +# DRM +vendor/lib64/libcpion.so +vendor/lib64/liboemcrypto.so +vendor/lib64/libtrustedapploader.so +vendor/lib64/mediacas/libclearkeycasplugin.so +vendor/lib64/mediadrm/libdrmclearkeyplugin.so + +# DRM (Qualcomm Secure Execution Environment) +vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service +vendor/bin/qseecomd +vendor/etc/init/qseecomd.rc +vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc +vendor/etc/vintf/manifest/vendor.qti.hardware.qseecom@1.0-service.xml +vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so +vendor/lib64/libQSEEComAPI.so +vendor/lib64/libdrmfs.so +vendor/lib64/vendor.qti.hardware.qseecom-V1-ndk.so +vendor/lib64/vendor.qti.hardware.qseecom@1.0.so + # Firmware vendor/etc/secnvm/k250a_47000400_0.img vendor/etc/secnvm/k250a_47000403_1.img @@ -262,15 +290,15 @@ vendor/lib64/bm4a73v08s12n62.bin vendor/bin/hw/android.hardware.gatekeeper-service vendor/bin/hw/android.hardware.gatekeeper-service-spu-qti vendor/bin/hw/vendor.qti.hardware.secureprocessor@1.0 -vendor/etc/init/android.hardware.gatekeeper-service-qti.rc vendor/etc/init/android.hardware.gatekeeper-service-spu-qti.rc vendor/etc/init/android.hardware.gatekeeper-service.rc -vendor/etc/init/init.vendor.qti.spu@1.1-service.rc vendor/etc/init/vendor.qti.hardware.secureprocessor@1.0.rc vendor/lib64/hw/gatekeeper.mdfpp.so vendor/lib64/hw/libspuqtigatekeeper.so +vendor/lib64/libgpt.so +vendor/lib64/librpmb.so vendor/lib64/libspcom.so -vendor/lib64/libspukeymintdeviceutils.so +vendor/lib64/libssd.so vendor/lib64/vendor.qti.hardware.secureprocessor.common@1.0-helper.so vendor/lib64/vendor.qti.hardware.secureprocessor.common@1.0.so vendor/lib64/vendor.qti.hardware.secureprocessor.config@1.0.so @@ -284,6 +312,12 @@ vendor/lib64/libadreno_utils.so vendor/lib64/libgsl.so vendor/lib64/libllvm-glnext.so +# Keymaster +vendor/bin/vendor.samsung.hardware.security.fkeymaster-service +vendor/etc/init/vendor.samsung.hardware.security.fkeymaster-service.rc +vendor/etc/vintf/manifest/vendor.samsung.hardware.security.fkeymaster-service.xml +vendor/lib64/vendor.samsung.hardware.security.fkeymaster-V1-ndk.so + # Memory vendor/lib64/libvmmem.so @@ -291,28 +325,16 @@ vendor/lib64/libvmmem.so vendor/lib64/libpdmapper.so vendor/lib64/libpdnotifier.so +# Protobuf +vendor/lib64/libprotobuf-cpp-full-21.7.so +vendor/lib64/libprotobuf-cpp-lite-21.7.so + # QMI vendor/lib64/libqmi_cci.so vendor/lib64/libqmi_common_so.so vendor/lib64/libqmi_encdec.so vendor/lib64/libqrtr.so -# QSEECOM -vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service -vendor/bin/qseecomd -vendor/etc/init/qseecomd.rc -vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc -vendor/etc/vintf/manifest/vendor.qti.hardware.qseecom@1.0-service.xml -vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so -vendor/lib64/libQSEEComAPI.so -vendor/lib64/libdrmfs.so -vendor/lib64/vendor.qti.hardware.qseecom-V1-ndk.so -vendor/lib64/vendor.qti.hardware.qseecom@1.0.so - -# QTEE -vendor/lib64/libGPTEE_vendor.so -vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so - # RIL vendor/lib64/libsec_semRil.so vendor/lib64/libsecril-client.so;MODULE_SUFFIX=_vendor @@ -320,11 +342,13 @@ vendor/lib64/libsecril-client.so;MODULE_SUFFIX=_vendor # Secure element vendor/bin/hw/android.hardware.secure_element-service.nxp +# Secure element (power manager) +vendor/lib64/vendor.qti.esepowermanager@1.0.so + # Security vendor/bin/hw/android.hardware.security.keymint-service vendor/bin/hw/android.hardware.security.keymint-service-spu-qti vendor/etc/init/android.hardware.security.keymint-service-spu-qti.rc -vendor/etc/vintf/manifest/android.hardware.security.keymint-service-spu-qti.xml vendor/lib64/libhermes_cred.so vendor/lib64/libsec_esek.so vendor/lib64/libsec_semHalTlc.so @@ -332,6 +356,7 @@ vendor/lib64/libskeymint10device.so vendor/lib64/libskeymint_cli.so vendor/lib64/libspictrl.so vendor/lib64/libspukeymint.so +vendor/lib64/libspukeymintdeviceutils.so vendor/lib64/libspukeymintutils.so vendor/lib64/vendor.samsung.hardware.keymint-V3-ndk.so