From 52a62986700d398248674883ac7a92eedd2eaee4 Mon Sep 17 00:00:00 2001
From: Edwin Wong <edwinwong@google.com>
Date: Wed, 31 Jan 2018 10:29:05 -0800
Subject: [PATCH] wayne-common: Add SELinux policy for 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

bug: 69635855
Change-Id: I61e9c272c2a2788fd07d5c12921d28c785661b77
---
 manifest.xml | 4 +++-
 wayne.mk     | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index e437143b..33c433e1 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -83,16 +83,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>
         <fqname>@1.1::ICryptoFactory/clearkey</fqname>
         <fqname>@1.1::IDrmFactory/clearkey</fqname>
diff --git a/wayne.mk b/wayne.mk
index ddb889e4..65fe2824 100644
--- a/wayne.mk
+++ b/wayne.mk
@@ -200,7 +200,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.drm@1.0-impl \
     android.hardware.drm@1.0-service \
-    android.hardware.drm@1.0-service.widevine
+    android.hardware.drm@1.1-service.clearkey
+
+# FBE support
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/rootdir/bin/init.qti.qseecomd.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qti.qseecomd.sh
 
 # FM
 PRODUCT_PACKAGES += \