summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdwin Wong <edwinwong@google.com>2018-01-31 10:29:05 -0800
committerTingyiChen <tingyi364@gmail.com>2019-08-13 11:45:48 +0200
commit47bf3d8d9190544783f1f2b4aae32dd997d69cc5 (patch)
tree79f962b5638ae2b6a3a5718882573179b6f9e792
parent717618006391d003ce7a36d3406ae58b2b41aa1e (diff)
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
-rw-r--r--manifest.xml4
-rw-r--r--wayne.mk6
2 files changed, 8 insertions, 2 deletions
diff --git a/manifest.xml b/manifest.xml
index eeacb9c..a103131 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 f407378..9a88d02 100644
--- a/wayne.mk
+++ b/wayne.mk
@@ -209,7 +209,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 += \