vince: Build clearkey HIDL service.

Convert clearkey plugin to HIDL to support drm HAL v1.1. Add SELinux policy for [email protected]. Test: CTS test ANDROID_BUILD_TOP= ./android-ccts-tradefed run cts-dev --module CtsMediaTestCases -t android.media.cts.ClearKeySystemTest#testClearKeyPlaybackCenc Merged-In: I61e9c272c2a2788fd07d5c12921d28c785661b77 bug: 69635855 Change-Id: I2b6dad3cbefa210400c0169b497ed58d355b85ab
ShantanuSingh555 · Mar 24, 2019 · 387c879 · 387c879
1 parent c72100c
commit 387c879
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/device.mk b/device.mk
@@ -188,7 +188,8 @@ PRODUCT_BOOT_JARS += \
 # DRM
 PRODUCT_PACKAGES += \
     [email protected] \
-    [email protected]
+    [email protected] \
+    [email protected]
 
 # Ebtables
 PRODUCT_PACKAGES += \

diff --git a/manifest.xml b/manifest.xml
@@ -65,16 +65,18 @@
     <hal format="hidl">
         <name>android.hardware.drm</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
         <interface>
             <name>ICryptoFactory</name>
             <instance>default</instance>
             <instance>widevine</instance>
+            <instance>clearkey</instance>
         </interface>
         <interface>
             <name>IDrmFactory</name>
             <instance>default</instance>
             <instance>widevine</instance>
+            <instance>clearkey</instance>
         </interface>
     </hal>
     <hal format="hidl">

diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
@@ -16,6 +16,7 @@
 
 # HALs
 /(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.0-service\.widevine         u:object_r:hal_drm_widevine_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.1-service\.clearkey         u:object_r:hal_drm_clearkey_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service\.vince         u:object_r:hal_light_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.usb@1\.0-service\.vince       u:object_r:hal_usb_default_exec:s0