From a37060dbba3ccdbb3a9385a8e51a76b5ea1124d9 Mon Sep 17 00:00:00 2001
From: Edwin Wong <edwinwong@google.com>
Date: Mon, 28 Sep 2020 21:07:23 -0700
Subject: Use shared libdrmframeworkcommon.

The libdrmframeworkcommon was statically linked
to multiple libraries used by libfwdlockengine.
When the shared libraries closes, the same block
of static memory will be freed twice.

Test: CTS forwardlock tests
  atest CtsDrmTestCases
Bug: 155647761
Change-Id: I45113549772d48e925082d15659b1409cbed6499
(cherry picked from commit 4ed2e6b76dc955a400ed252ce162ee6335276858)
---
 drm/jni/Android.bp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'drm')

diff --git a/drm/jni/Android.bp b/drm/jni/Android.bp
index 1e33f0ea5094..68757d86fb89 100644
--- a/drm/jni/Android.bp
+++ b/drm/jni/Android.bp
@@ -21,6 +21,7 @@ cc_library_shared {
 
     shared_libs: [
         "libdrmframework",
+        "libdrmframeworkcommon",
         "liblog",
         "libutils",
         "libandroid_runtime",
-- 
cgit v1.2.3