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

Commit 4ce04efe authored Oct 12, 2022 by Ray Essick Committed by Automerger Merge Worker Oct 12, 2022

Merge "media: Switch to libwebm_mkvparser from libwebm" am: 53e5651e am: 70c330cb

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

Change-Id: If48ede9eb7bb13835f0830a0bac2fedead5b1ed6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 90a2e7a5 70c330cb

media/module/extractors/fuzzers/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -173,7 +173,7 @@ cc_fuzz {
		],

		static_libs: [
		"libwebm",
		"libwebm_mkvparser",
		"libstagefright_flacdec",
		"libstagefright_metadatautils",
		"libmkvextractor",

media/module/extractors/mkv/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ cc_library {
		"libstagefright_foundation_colorutils_ndk", // for mainline-safe ColorUtils
		"libstagefright_foundation",
		"libstagefright_metadatautils",
		"libwebm",
		"libwebm_mkvparser",
		"libutils",
		],

media/module/extractors/tests/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ cc_test {
		"libmedia_midiiowrapper",
		"libsonivoxwithoutjet",
		"libvorbisidec",
		"libwebm",
		"libwebm_mkvparser",
		"libFLAC",
		],