commit 53e5651ea5f6be0130eb3fd4859cbc403a714b27
author Ray Essick <essick@google.com> Wed Oct 12 19:37:59 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 12 19:37:59 2022 +0000
tree f8fcf0362bcf3a2bb8d09533e8d1534b8ef9db95
parent cafc724ee1e9621cb2345667b3e4eeab6f6f2c2c
parent b1556993e6a32bb2dbe4be4b7329cece9f531b20

Merge "media: Switch to libwebm_mkvparser from libwebm"

media/module/extractors/fuzzers/Android.bp

diff --git a/media/module/extractors/fuzzers/Android.bp b/media/module/extractors/fuzzers/Android.bp
index 490e195..b3e34d2 100644
--- a/media/module/extractors/fuzzers/Android.bp
+++ b/media/module/extractors/fuzzers/Android.bp
@@ -173,7 +173,7 @@
     ],
 
     static_libs: [
-        "libwebm",
+        "libwebm_mkvparser",
         "libstagefright_flacdec",
         "libstagefright_metadatautils",
         "libmkvextractor",

media/module/extractors/mkv/Android.bp

diff --git a/media/module/extractors/mkv/Android.bp b/media/module/extractors/mkv/Android.bp
index 98ce305..c4b67eb 100644
--- a/media/module/extractors/mkv/Android.bp
+++ b/media/module/extractors/mkv/Android.bp
@@ -33,7 +33,7 @@
         "libstagefright_foundation_colorutils_ndk",   // for mainline-safe ColorUtils
         "libstagefright_foundation",
         "libstagefright_metadatautils",
-        "libwebm",
+        "libwebm_mkvparser",
         "libutils",
     ],
 

media/module/extractors/tests/Android.bp

diff --git a/media/module/extractors/tests/Android.bp b/media/module/extractors/tests/Android.bp
index 3c3bbdc..d6e79c7 100644
--- a/media/module/extractors/tests/Android.bp
+++ b/media/module/extractors/tests/Android.bp
@@ -55,7 +55,7 @@
         "libmedia_midiiowrapper",
         "libsonivoxwithoutjet",
         "libvorbisidec",
-        "libwebm",
+        "libwebm_mkvparser",
         "libFLAC",
     ],