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

Commit 3c7e8c4f authored Mar 11, 2021 by Ray Essick Committed by Automerger Merge Worker Mar 11, 2021

Merge "Flac codec link statically against libaudio_utils" into sc-dev am: a7bdba5d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfce5e2a5fc98b8964a59a425b4a8d819475d795

parents 4b8f765a a7bdba5d

media/codec2/components/flac/Android.bp

+1 −4

Original line number	Diff line number	Diff line
		@@ -42,11 +42,8 @@ cc_library {

		srcs: ["C2SoftFlacEnc.cpp"],

		shared_libs: [
		"libaudioutils",
		],

		static_libs: [
		"libFLAC",
		"libaudioutils",
		],
		}

media/libstagefright/flac/dec/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,12 +40,12 @@ cc_library {
		},

		shared_libs: [
		"libaudioutils",
		"liblog",
		],

		static_libs: [
		"libFLAC",
		"libaudioutils", // needed for 'float_from_i32'
		],

		export_static_lib_headers: [