From 3543d249b7a1108f23b25e85153ab5933b6c7425 Mon Sep 17 00:00:00 2001 From: Max Weffers Date: Fri, 10 Apr 2020 11:09:57 +0200 Subject: [PATCH] clover: unify DRM and Keymaster libs Change-Id: I9620e1316eac1d0a23cf25dc7f4969fdc826d2df --- BoardConfig.mk | 2 +- extract-files.sh | 0 proprietary-files.txt | 69 -------------------------------------- rootdir/etc/init.device.rc | 2 +- setup-makefiles.sh | 0 5 files changed, 2 insertions(+), 71 deletions(-) mode change 100644 => 100755 extract-files.sh mode change 100644 => 100755 setup-makefiles.sh diff --git a/BoardConfig.mk b/BoardConfig.mk index c8d8e79..8440ad6 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -43,4 +43,4 @@ DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml BOARD_VENDOR_PLATFORM := xiaomi-sdm660 # Vendor Security patch level -VENDOR_SECURITY_PATCH := 2018-12-01 +VENDOR_SECURITY_PATCH := 2019-12-05 diff --git a/extract-files.sh b/extract-files.sh old mode 100644 new mode 100755 diff --git a/proprietary-files.txt b/proprietary-files.txt index f62969e..9aa5174 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -377,67 +377,6 @@ vendor/lib/libmmcamera_isp_sub_module.so vendor/etc/qdcm_calib_data_NT51021_BOE_BOE.xml vendor/etc/qdcm_calib_data_NT51021_BOE_BOE10.xml -# DRM -lib/libGPTEE_system.so -lib/libQTEEConnector_system.so -lib/vendor.qti.hardware.qteeconnector@1.0.so -lib64/libGPTEE_system.so -lib64/libQTEEConnector_system.so -lib64/vendor.qti.hardware.qteeconnector@1.0.so -vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service -vendor/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc -vendor/bin/qseecomd -vendor/lib/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so -vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so -vendor/lib/vendor.qti.hardware.qteeconnector@1.0_vendor.so -vendor/lib/libbase64.so -vendor/lib/libcppf.so -vendor/lib/libdrmfs.so -vendor/lib/libdrmtime.so -vendor/lib/libGPTEE_vendor.so -vendor/lib/libGPreqcancel_svc.so -vendor/lib/libGPreqcancel.so -vendor/lib/libmm-hdcpmgr.so -vendor/lib/libqisl.so -vendor/lib/libQSEEComAPI.so -vendor/lib/libQTEEConnector_vendor.so -vendor/lib/librmp.so -vendor/lib/librpmb.so -vendor/lib/libsdedrm.so -vendor/lib/libsecureui.so -vendor/lib/libsecureui_svcsock.so -vendor/lib/libSecureUILib.so -vendor/lib/libsi.so -vendor/lib/libssd.so -vendor/lib/libStDrvInt.so -vendor/lib/libtzdrmgenprov.so -vendor/lib/qcdrm/playready/lib/drm/libdrmprplugin_customer.so -vendor/lib/qcdrm/playready/lib/libprdrmdecrypt_customer.so -vendor/lib/qcdrm/playready/lib/libtzplayready_customer.so -vendor/lib/qcdrm/playready/lib/mediadrm/libprmediadrmdecrypt_customer.so -vendor/lib/qcdrm/playready/lib/mediadrm/libprmediadrmplugin_customer.so -vendor/lib64/libbase64.so -vendor/lib64/libdrmfs.so -vendor/lib64/libdrmtime.so -vendor/lib64/libGPTEE_vendor.so -vendor/lib64/libGPreqcancel_svc.so -vendor/lib64/libGPreqcancel.so -vendor/lib64/libmm-hdcpmgr.so -vendor/lib64/libqisl.so -vendor/lib64/libQSEEComAPI.so -vendor/lib64/libQTEEConnector_vendor.so -vendor/lib64/librmp.so -vendor/lib64/librpmb.so -vendor/lib64/libsdedrm.so -vendor/lib64/libsecureui_svcsock.so -vendor/lib64/libsecureui.so -vendor/lib64/libSecureUILib.so -vendor/lib64/libsi.so -vendor/lib64/libssd.so -vendor/lib64/libStDrvInt.so -vendor/lib64/libtzdrmgenprov.so -vendor/lib64/vendor.qti.hardware.qteeconnector@1.0_vendor.so - # Fingerprint sensor -vendor/app/FingerprintExtensionService/FingerprintExtensionService.apk -vendor/app/QFingerprintService/QFingerprintService.apk @@ -458,14 +397,6 @@ vendor/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so vendor/lib64/hw/gatekeeper.sdm660.so vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so -# Keymaster -vendor/lib/libkeymasterutils.so -vendor/lib/libkeymasterprovision.so -vendor/lib/libkeymasterdeviceutils.so -vendor/lib64/libkeymasterutils.so -vendor/lib64/libkeymasterprovision.so -vendor/lib64/libkeymasterdeviceutils.so - # Keystore vendor/bin/hw/android.hardware.keymaster@3.0-service-qti vendor/etc/init/android.hardware.keymaster@3.0-service-qti.rc diff --git a/rootdir/etc/init.device.rc b/rootdir/etc/init.device.rc index 3f5def8..92ee433 100644 --- a/rootdir/etc/init.device.rc +++ b/rootdir/etc/init.device.rc @@ -49,7 +49,7 @@ on property:sys.incall=false write /sys/class/power_supply/battery/constant_charge_current_max 1000000 on post-fs - wait_for_prop sys.listeners.registered true + wait_for_prop vendor.sys.listeners.registered true on boot start macaddress_setup diff --git a/setup-makefiles.sh b/setup-makefiles.sh old mode 100644 new mode 100755