From 387c879e6de42d87193ad0cbb940a544acb6f0c4 Mon Sep 17 00:00:00 2001
From: Edwin Wong <edwinwong@google.com>
Date: Sun, 24 Mar 2019 12:52:41 +0100
Subject: [PATCH] vince: Build clearkey HIDL service.

Convert clearkey plugin to HIDL to support drm HAL v1.1.
Add SELinux policy for android.hardware.drm@1.1-service.clearkey.

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
---
 device.mk              | 3 ++-
 manifest.xml           | 4 +++-
 sepolicy/file_contexts | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/device.mk b/device.mk
index 671ef50..a8c45c9 100644
--- a/device.mk
+++ b/device.mk
@@ -188,7 +188,8 @@ PRODUCT_BOOT_JARS += \
 # DRM
 PRODUCT_PACKAGES += \
     android.hardware.drm@1.0-impl \
-    android.hardware.drm@1.0-service
+    android.hardware.drm@1.0-service \
+    android.hardware.drm@1.1-service.clearkey
 
 # Ebtables
 PRODUCT_PACKAGES += \
diff --git a/manifest.xml b/manifest.xml
index 82f6914..aad3f58 100644
--- 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
index aad2878..b74d635 100644
--- 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