From 45bf972dcfc4be39f9e2e22abafbd36804afd8e5 Mon Sep 17 00:00:00 2001
From: Edwin Wong <edwinwong@google.com>
Date: Mon, 21 Oct 2019 14:43:03 -0700
Subject: [PATCH] Add Widevine L3 drm service to cuttlefish

Cuttlefish includes GMS core, Widevine is required.
Add Widevine security level 3 drm service to cuttlefish.

Since we do not want to include vendor Widevine as open code
in cuttlefish's manifest, we will use LOGCAL_VINTF_FRAGMENTS
to refer to Widevine hal in Android.mk here.

Test: tests from gts WidevineDashPolicyTests classs
  ANDROID_BUILD_TOP= ./android-gts/tools/gts-tradefed run gts-dev \
  -m GtsMediaTestCases \
  --test com.google.android.media.gts.WidevineDashPolicyTests \
  #testL3LongLicenseShortPlayback

bug: 141621537
Change-Id: Ibaf5b77ba337c778a45560b20ca752a19724cc9d
---
 libwvdrmengine/Android.mk                     |  2 ++
 ...roid.hardware.drm@1.2-service.widevine.xml | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 libwvdrmengine/manifest_android.hardware.drm@1.2-service.widevine.xml

diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk
index f7f44f58..502f5bf6 100644
--- a/libwvdrmengine/Android.mk
+++ b/libwvdrmengine/Android.mk
@@ -48,6 +48,7 @@ include $(LOCAL_PATH)/common_widevine_service.mk
 LOCAL_SRC_FILES := src_hidl/service.cpp
 LOCAL_MODULE := android.hardware.drm@1.2-service.widevine
 LOCAL_INIT_RC := src_hidl/android.hardware.drm@1.2-service.widevine.rc
+LOCAL_VINTF_FRAGMENTS := manifest_android.hardware.drm@1.2-service.widevine.xml
 
 include $(BUILD_EXECUTABLE)
 
@@ -61,6 +62,7 @@ LOCAL_SRC_FILES := src_hidl/serviceLazy.cpp
 LOCAL_MODULE := android.hardware.drm@1.2-service-lazy.widevine
 LOCAL_OVERRIDES_MODULES := android.hardware.drm@1.2-service.widevine
 LOCAL_INIT_RC := src_hidl/android.hardware.drm@1.2-service-lazy.widevine.rc
+LOCAL_VINTF_FRAGMENTS := manifest_android.hardware.drm@1.2-service.widevine.xml
 
 include $(BUILD_EXECUTABLE)
 
diff --git a/libwvdrmengine/manifest_android.hardware.drm@1.2-service.widevine.xml b/libwvdrmengine/manifest_android.hardware.drm@1.2-service.widevine.xml
new file mode 100644
index 00000000..85cd44cf
--- /dev/null
+++ b/libwvdrmengine/manifest_android.hardware.drm@1.2-service.widevine.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.drm</name>
+        <transport>hwbinder</transport>
+        <fqname>@1.2::ICryptoFactory/widevine</fqname>
+        <fqname>@1.2::IDrmFactory/widevine</fqname>
+    </hal>
+</manifest>