commit d2e9b81df0fea6a95d910705ad2ff56179e2ce19
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 11 00:41:47 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 11 00:41:47 2019 +0000
tree 86a25adf3304351e5250f01ce977c8a55c95d2a9
parent 01b3b33248ccfbc304682520378e10be85c52394
parent 00573265bdef9ac2c985a519656067e0119243c9

Merge "enable drm hal feature"

BoardConfigCommon.mk

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index e559dad..45cdcee 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -20,6 +20,8 @@
 PRODUCT_FULL_TREBLE_OVERRIDE := true
 BOARD_VNDK_VERSION := current
 
+TARGET_ENABLE_MEDIADRM_64 := true
+
 # generic wifi
 WPA_SUPPLICANT_VERSION := VER_0_8_X
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 27a5445..e38e9c8 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -80,6 +80,7 @@
 
 PRODUCT_PACKAGES += \
     android.hardware.drm@1.0-impl \
+    android.hardware.drm@1.0-service \
 
 PRODUCT_PACKAGES += libGLES_android
 

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 84d82e9..1459ee8 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -42,7 +42,7 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.drm</name>
-        <transport arch="32">passthrough</transport>
+        <transport>hwbinder</transport>
         <version>1.0</version>
         <interface>
             <name>ICryptoFactory</name>

sepolicy/hal_drm_default.te

diff --git a/sepolicy/hal_drm_default.te b/sepolicy/hal_drm_default.te
new file mode 100644
index 0000000..5177496
--- /dev/null
+++ b/sepolicy/hal_drm_default.te
@@ -0,0 +1 @@
+vndbinder_use(hal_drm_default);

sepolicy/mediadrmserver.te

diff --git a/sepolicy/mediadrmserver.te b/sepolicy/mediadrmserver.te
new file mode 100644
index 0000000..52a8311
--- /dev/null
+++ b/sepolicy/mediadrmserver.te
@@ -0,0 +1 @@
+binder_call(mediadrmserver, mediacodec)