diff options
| author | Edwin Wong <edwinwong@google.com> | 2020-09-28 21:07:23 -0700 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-11-12 18:34:23 +0000 |
| commit | a4fd6cb062c18be8fefd3b787a8663574a4ec60f (patch) | |
| tree | 84968760a5ed39d4f96b07194869e33ca43b6452 | |
| parent | afa79a6b28018acb66b065abc92fccf26ce94d61 (diff) | |
| download | base-a4fd6cb062c18be8fefd3b787a8663574a4ec60f.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)
| -rw-r--r-- | drm/jni/Android.bp | 1 |
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", |