From 0153ea8035831b437aaadd1e4f8622227bf0e362 Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Wed, 29 Nov 2023 17:19:55 +0900 Subject: [PATCH] Revert "universal7885: Adapt to DRM hal changes from 9820" This reverts commit 4518c616968e3a7b8149bdfcae4201fdcbf5167a. --- universal7885-common/configs/vintf/manifest.xml | 4 ++-- universal7885-common/proprietary-files.txt | 7 +++---- universal7885-common/universal7885-common.mk | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/universal7885-common/configs/vintf/manifest.xml b/universal7885-common/configs/vintf/manifest.xml index cc0dea0..3f929cd 100644 --- a/universal7885-common/configs/vintf/manifest.xml +++ b/universal7885-common/configs/vintf/manifest.xml @@ -27,8 +27,8 @@ android.hardware.drm hwbinder - @1.4::ICryptoFactory/widevine - @1.4::IDrmFactory/widevine + @1.3::ICryptoFactory/widevine + @1.3::IDrmFactory/widevine android.hardware.gatekeeper diff --git a/universal7885-common/proprietary-files.txt b/universal7885-common/proprietary-files.txt index cd4f9d5..0225dee 100644 --- a/universal7885-common/proprietary-files.txt +++ b/universal7885-common/proprietary-files.txt @@ -1,7 +1,6 @@ # 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/rild 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/gps.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.vendor.rilchip.rc vendor/etc/init/init.vendor.rilcommon.rc @@ -35,7 +34,7 @@ vendor/firmware/Tfa9896.cnt vendor/firmware/calliope_dram.bin vendor/firmware/calliope_sram.bin 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.Encoder.so vendor/lib/omx/libOMX.Exynos.HEVC.Decoder.so diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk index 67742da..9b261d2 100644 --- a/universal7885-common/universal7885-common.mk +++ b/universal7885-common/universal7885-common.mk @@ -113,7 +113,7 @@ $(call inherit-product, hardware/samsung-ext/interfaces/debug-tools/debug.mk) # DRM PRODUCT_PACKAGES += \ android.hardware.drm-service.clearkey \ - android.hardware.drm@1.4.vendor + android.hardware.drm@1.3.vendor # Fingerprint TARGET_BOARD_HAS_FP ?= true