From b573e138ce27a2e58145cb0c928ffca7894a074e Mon Sep 17 00:00:00 2001
From: Robert Shih <robertshih@google.com>
Date: Wed, 9 Mar 2022 00:21:48 -0800
Subject: [PATCH 1/2] Widevine PRODUCT_PACKAGES makefiles

Bug: 170611688
Bug: 228299194
Change-Id: I6f63e271f53cc76af91b4b8b6474e3a3e53ee800
---
 service-lazy.mk | 1 +
 service.mk      | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 service-lazy.mk
 create mode 100644 service.mk

diff --git a/service-lazy.mk b/service-lazy.mk
new file mode 100644
index 00000000..2ac8bf0b
--- /dev/null
+++ b/service-lazy.mk
@@ -0,0 +1 @@
+PRODUCT_PACKAGES += android.hardware.drm-service-lazy.widevine
diff --git a/service.mk b/service.mk
new file mode 100644
index 00000000..08a25eb3
--- /dev/null
+++ b/service.mk
@@ -0,0 +1 @@
+PRODUCT_PACKAGES += android.hardware.drm-service.widevine

From 5a1d5e88371a914a580b55f2edc7ba130c41f221 Mon Sep 17 00:00:00 2001
From: Robert Shih <robertshih@google.com>
Date: Tue, 5 Apr 2022 00:44:38 +0000
Subject: [PATCH 2/2] WVCdm: no destroy global log buffer on exit

[ Merge of go/wvgerrit/149989 ]

Bug: 227848537
Change-Id: I9407b133654c20ddcd3c15404dd19b3719064e6e
Test: Irdeto monkey test
---
 libwvdrmengine/cdm/util/src/log.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libwvdrmengine/cdm/util/src/log.cpp b/libwvdrmengine/cdm/util/src/log.cpp
index 8dedcc5c..d9fc58ae 100644
--- a/libwvdrmengine/cdm/util/src/log.cpp
+++ b/libwvdrmengine/cdm/util/src/log.cpp
@@ -57,7 +57,11 @@ int64_t GetCurrentTimeMs() {
 
 LogPriority g_cutoff = CDM_LOG_VERBOSE;
 
-LogBuffer g_logbuf;
+// This LogBuffer instance shares its mutex with multiple
+// threads which might not release the mutex if suddenly closed
+// by a signal.  Destroying an in-use mutex may cause a process
+// crash.  Leave memory clean to the kernel when the process exits.
+[[clang::no_destroy]] LogBuffer g_logbuf;
 
 thread_local bool tl_logging_uid_set_ = false;