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

Commit 43006177 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only include webm headers in libmediaplayerservice" into tm-dev am:...

Merge "Only include webm headers in libmediaplayerservice" into tm-dev am: b05437b5 am: a79924dd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/17543940



Change-Id: Ia1f6dd856fe358a26ab7b68768ec6eb6b4f43a3e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4ccd9f6 a79924dd
Loading
Loading
Loading
Loading
+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",
    ],