commit a37060dbba3ccdbb3a9385a8e51a76b5ea1124d9
author Edwin Wong <edwinwong@google.com> Mon Sep 28 21:07:23 2020 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Tue Oct 13 01:07:58 2020 +0000
tree 84968760a5ed39d4f96b07194869e33ca43b6452
parent 1a6f1fb402b96df561b9672aef1e4fce8a13de80

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

diff --git a/drm/jni/Android.bp b/drm/jni/Android.bp
index 1e33f0e..68757d8 100644
--- a/drm/jni/Android.bp
+++ b/drm/jni/Android.bp
@@ -21,6 +21,7 @@
 
     shared_libs: [
         "libdrmframework",
+        "libdrmframeworkcommon",
         "liblog",
         "libutils",
         "libandroid_runtime",