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
diff --git a/media/libmediaplayerservice/Android.bp b/media/libmediaplayerservice/Android.bp
index a23d1d9..266cb17 100644
--- a/media/libmediaplayerservice/Android.bp
+++ b/media/libmediaplayerservice/Android.bp
@@ -72,6 +72,7 @@
"media_plugin_headers",
"libmediautils_headers",
"libstagefright_rtsp_headers",
+ "libstagefright_webm_headers",
],
static_libs: [
@@ -79,9 +80,6 @@
"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",
],