Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62138b3e authored by Ray Essick's avatar Ray Essick
Browse files

Only include webm headers in libmediaplayerservice 

Binary included both static + shared copies of same library. This caused static
constructors/destructors to run twice, causing pointer/free havoc.

Bug: 227660073
Test: boot
Test: atest android.media.player.cts.MediaPlayerTest
Change-Id: Ib9790771375e1cab39d0e76ee48b893b435ae27a
parent 09b26540

media/libmediaplayerservice/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ cc_library { 
        "media_plugin_headers",

        "libmediautils_headers",

        "libstagefright_rtsp_headers",

        "libstagefright_webm_headers",

    ],



    static_libs: [
@@ -79,9 +80,6 @@ cc_library { 
        "libstagefright_nuplayer",

        "libstagefright_rtsp",

        "libstagefright_timedtext",

        // this needs it, but it can get it transitively through libstagefright.

        // i'm going to leave it here.

        "libstagefright_webm",

        "framework-permission-aidl-cpp",

    ],