commit fb4fbb97bd37000e4f35c77c178a0fb36ee9ce9d
author Kyle Zhang <kelzhan@google.com> Wed Mar 02 00:37:09 2022 +0000
committer Kyle Zhang <kelzhan@google.com> Wed Mar 02 21:56:38 2022 +0000
tree 09efc62dcef6b5f46aeb4f9656550b3bf90922d3
parent 8d3a0460a01ac8317682d9324768c2b2cbebf301

use aidl interface

Bug: 219538389
Test: atest GtsMediaTestCases
Change-Id: I01ceb9bdb60ff6d9323acee3d7140b68b31a465f

device.mk

diff --git a/device.mk b/device.mk
index 93ac72d..75cdacf 100644
--- a/device.mk
+++ b/device.mk
@@ -440,10 +440,8 @@
 
 # DRM HAL
 PRODUCT_PACKAGES += \
-    android.hardware.drm@1.0-impl \
-    android.hardware.drm@1.0-service \
-    android.hardware.drm@1.4-service.clearkey \
-    android.hardware.drm@1.4-service.widevine
+    android.hardware.drm-service.clearkey \
+    android.hardware.drm-service.widevine
 
 # NFC and Secure Element packages
 PRODUCT_PACKAGES += \

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 6325c1d..e1930bb 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -385,24 +385,6 @@
         </interface>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.drm</name>
-        <transport>hwbinder</transport>
-        <impl level="generic"></impl>
-        <version>1.0</version>
-        <interface>
-            <name>ICryptoFactory</name>
-            <instance>widevine</instance>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IDrmFactory</name>
-            <instance>widevine</instance>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.2::ICryptoFactory/clearkey</fqname>
-        <fqname>@1.2::IDrmFactory/clearkey</fqname>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>
         <version>1.4</version>