Revert "universal7885: Adapt to DRM hal changes from 9820"

This reverts commit 4518c61696.
This commit is contained in:
roynatech2544 2023-11-29 17:19:55 +09:00
commit 0153ea8035
No known key found for this signature in database
GPG key ID: 389DAC92CAECBBCC
3 changed files with 6 additions and 7 deletions

View file

@ -27,8 +27,8 @@
<hal format="hidl"> <hal format="hidl">
<name>android.hardware.drm</name> <name>android.hardware.drm</name>
<transport>hwbinder</transport> <transport>hwbinder</transport>
<fqname>@1.4::ICryptoFactory/widevine</fqname> <fqname>@1.3::ICryptoFactory/widevine</fqname>
<fqname>@1.4::IDrmFactory/widevine</fqname> <fqname>@1.3::IDrmFactory/widevine</fqname>
</hal> </hal>
<hal format="hidl"> <hal format="hidl">
<name>android.hardware.gatekeeper</name> <name>android.hardware.gatekeeper</name>

View file

@ -1,7 +1,6 @@
# All blobs below are extracted from samsung/a20ektt/a20e:11/RP1A.200720.012/A202KKKU8CUL3:user/release-keys, unless otherwise stated. # All blobs below are extracted from samsung/a20ektt/a20e:11/RP1A.200720.012/A202KKKU8CUL3:user/release-keys, unless otherwise stated.
# Widevine DRM blobs from exynos9820 common
vendor/bin/hw/android.hardware.drm@1.4-service.widevine vendor/bin/hw/android.hardware.drm@1.3-service.widevine
vendor/bin/hw/macloader vendor/bin/hw/macloader
vendor/bin/hw/rild vendor/bin/hw/rild
vendor/bin/hw/vendor.samsung.hardware.gnss@2.0-service vendor/bin/hw/vendor.samsung.hardware.gnss@2.0-service
@ -14,7 +13,7 @@ vendor/etc/dolby/dax-default.xml
vendor/etc/gnss/ca.pem vendor/etc/gnss/ca.pem
vendor/etc/gnss/gps.cfg vendor/etc/gnss/gps.cfg
vendor/etc/gnss/gps.debug.cfg vendor/etc/gnss/gps.debug.cfg
vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc
vendor/etc/init/init.gps.rc vendor/etc/init/init.gps.rc
vendor/etc/init/init.vendor.rilchip.rc vendor/etc/init/init.vendor.rilchip.rc
vendor/etc/init/init.vendor.rilcommon.rc vendor/etc/init/init.vendor.rilcommon.rc
@ -35,7 +34,7 @@ vendor/firmware/Tfa9896.cnt
vendor/firmware/calliope_dram.bin vendor/firmware/calliope_dram.bin
vendor/firmware/calliope_sram.bin vendor/firmware/calliope_sram.bin
vendor/lib/egl/libGLES_mali.so vendor/lib/egl/libGLES_mali.so
vendor/lib/libdrmresource.so vendor/lib/mediadrm/libwvdrmengine.so
vendor/lib/omx/libOMX.Exynos.AVC.Decoder.so vendor/lib/omx/libOMX.Exynos.AVC.Decoder.so
vendor/lib/omx/libOMX.Exynos.AVC.Encoder.so vendor/lib/omx/libOMX.Exynos.AVC.Encoder.so
vendor/lib/omx/libOMX.Exynos.HEVC.Decoder.so vendor/lib/omx/libOMX.Exynos.HEVC.Decoder.so

View file

@ -113,7 +113,7 @@ $(call inherit-product, hardware/samsung-ext/interfaces/debug-tools/debug.mk)
# DRM # DRM
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.drm-service.clearkey \ android.hardware.drm-service.clearkey \
android.hardware.drm@1.4.vendor android.hardware.drm@1.3.vendor
# Fingerprint # Fingerprint
TARGET_BOARD_HAS_FP ?= true TARGET_BOARD_HAS_FP ?= true