summaryrefslogtreecommitdiff
path: root/drm
diff options
context:
space:
mode:
authorEdwin Wong <edwinwong@google.com>2020-09-28 21:07:23 -0700
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-10-13 01:07:58 +0000
commita37060dbba3ccdbb3a9385a8e51a76b5ea1124d9 (patch)
tree84968760a5ed39d4f96b07194869e33ca43b6452 /drm
parent1a6f1fb402b96df561b9672aef1e4fce8a13de80 (diff)
downloadbase-a37060dbba3ccdbb3a9385a8e51a76b5ea1124d9.tar.gz
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)
Diffstat (limited to 'drm')
-rw-r--r--drm/jni/Android.bp1
1 files changed, 1 insertions, 0 deletions
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",