From 14386eae4f7a5aebcb69669073caa4d1bebbc180 Mon Sep 17 00:00:00 2001
From: Adhitya Mohan <me@adhityamohan.in>
Date: Sun, 15 Nov 2020 15:48:46 +0530
Subject: [PATCH] zippo: Update DRM HAL entries

* Remove deprecated drm 1.0
* push clearkey and widevine into seprate fragment files
* import widevine manifest file from sunfish

Change-Id: Ied04f06b89f3054cb95d4d5192007f9ead62d58a
---
 device.mk             |  2 --
 manifest.xml          | 19 ++-----------------
 proprietary-files.txt |  1 +
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/device.mk b/device.mk
index 1e32c27..62beeec 100644
--- a/device.mk
+++ b/device.mk
@@ -198,8 +198,6 @@ PRODUCT_PACKAGES += \
 
 # DRM
 PRODUCT_PACKAGES += \
-    android.hardware.drm@1.0-impl \
-    android.hardware.drm@1.0-service-lazy \
     android.hardware.drm@1.3-service.clearkey
 
 # Fingerprint
diff --git a/manifest.xml b/manifest.xml
index 42658ec..fc0e92a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -72,23 +72,8 @@
     <hal format="hidl">
         <name>android.hardware.drm</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ICryptoFactory</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IDrmFactory</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::ICryptoFactory/default</fqname>
-        <fqname>@1.0::IDrmFactory/default</fqname>
-        <fqname>@1.1::ICryptoFactory/wfdhdcp</fqname>
-        <fqname>@1.1::IDrmFactory/wfdhdcp</fqname>
-        <fqname>@1.2::ICryptoFactory/clearkey</fqname>
-        <fqname>@1.2::ICryptoFactory/widevine</fqname>
-        <fqname>@1.2::IDrmFactory/clearkey</fqname>
-        <fqname>@1.2::IDrmFactory/widevine</fqname>
+        <fqname>@1.3::ICryptoFactory/wfdhdcp</fqname>
+        <fqname>@1.3::IDrmFactory/wfdhdcp</fqname>
     </hal>
     <hal format="hidl">
         <name>android.hardware.gatekeeper</name>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 1cf9922..ceb54e1 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -618,6 +618,7 @@ vendor/lib64/libtzdrmgenprov.so
 vendor/bin/hw/android.hardware.drm@1.3-service.widevine|75103a18355966370895526dc9afb6adff4b755b
 vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc|c35e1a6f9a6faff19064a81e07c4be82ceaf4bb5
 vendor/lib64/libwvhidl.so|68d257f6c4b409f71f80c231789d9951f71308a8
+-vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml|ebebcf8f367641480cf7d512fc06e6ab777527be
 
 # ESE-Powermanager
 vendor/bin/hw/vendor.qti.esepowermanager@1.0-service