From 93addabfdbce96c4495c62283a8686b9b2b718a7 Mon Sep 17 00:00:00 2001
From: Xindong Xu<xindong.xu@amlogic.com>
Date: Tue, 23  Jan  2018  08:37:24  +0000
Subject: Widevine: version 13 support [1/6]

PD# 158058

1. give widevine service hal_drm_default_exec prop
2. modify PRODUCT_PACKAGES in media.mk

Change-Id: Ia0d6b5e169af40212a22445a9dc0f4932485f8a0
---
diff --git a/media.mk b/media.mk
index 66a2670..d2587ea 100644
--- a/media.mk
+++ b/media.mk
@@ -183,27 +183,11 @@ ifeq ($(TARGET_USE_SECUREOS), true)
 endif
 endif
 
-PRODUCT_PACKAGES += com.google.widevine.software.drm.xml \
-    com.google.widevine.software.drm \
-    libWVStreamControlAPI_L1 \
-    libdrmwvmplugin_L1 \
-    libwvm_L1 \
-    libwvdrm_L1 \
-    libWVStreamControlAPI_L3 \
-    libdrmwvmplugin \
-    libwvm \
-    libwvdrm_L3 \
-    libotzapi \
-    libwvsecureos_api \
-    libdrmdecrypt \
-    libwvdrmengine \
+PRODUCT_PACKAGES += android.hardware.drm@1.0-service.widevine \
+    libwvhidl \
     liboemcrypto \
-    widevine \
-    wvcenc \
-    edef8ba9-79d6-4ace-a3c827dcd51d21ed \
     e043cde0-61d0-11e5-9c260002a5d5c51b \
     secmem_test \
-    secureapi_test \
     oemcrypto_test
 
 ifeq ($(TARGET_WITH_AMLOGIC_PLAYERS), true)
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 73d1c80..deb59f7 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -150,6 +150,7 @@
 /vendor/xbin/bcmdl   	      u:object_r:bcmdl_exec:s0
 
 /(vendor|system/vendor)/bin/hw/android\.hardware\.dumpstate@1\.0-service.droidlogic      u:object_r:hal_dumpstate_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.drm@1\.0-service.widevine            u:object_r:hal_drm_default_exec:s0
 
 /vendor/lib(64)?/hw/gralloc\.amlogic\.so   u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/libfbcnf\.so              u:object_r:same_process_hal_file:s0
--
cgit