commit f271aef474fc2cc3fab4d9e51294989dd50c32fc
author Edwin Wong <edwinwong@google.com> Sat Sep 26 21:43:14 2020 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Tue Oct 13 01:06:43 2020 +0000
tree b777f9187cd771afc3b45f218b822ffb6a31e24c
parent 819799cea676af15b66dae81fb74f54f25b5d7d8

Build static and 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: Iace1b47a9172264c61ba936f486671c7846edf46
(cherry picked from commit 3be0c0d72b771d5f181086b35e47f30d3324bc4d)

drm/drmserver/Android.bp

diff --git a/drm/drmserver/Android.bp b/drm/drmserver/Android.bp
index b68e6c2..141fe70 100644
--- a/drm/drmserver/Android.bp
+++ b/drm/drmserver/Android.bp
@@ -31,12 +31,11 @@
         "liblog",
         "libbinder",
         "libdl",
+        "libdrmframeworkcommon",
         "libselinux",
         "libstagefright_foundation",
     ],
 
-    static_libs: ["libdrmframeworkcommon"],
-
     cflags: [
         "-Wall",
         "-Wextra",