Commit 07f9ef7a authored Jun 10, 2020 by Kris Alder Committed by Automerger Merge Worker Jun 10, 2020

Merge changes Ic59f05f6,Icda0e432 am: fd3a9793 am: 20c60e4d am: 256a0bef...

Merge changes Ic59f05f6,Icda0e432 am: fd3a9793 am: 20c60e4d am: 256a0bef am: dd662c99 am: fa068140

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

Change-Id: If3febc6dde700a611afd243795ab2844ff5a499e

media/libstagefright/flac/dec/Android.bp

+9 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@ cc_library {
		name: "libstagefright_flacdec",
		vendor_available: true,
		min_sdk_version: "29",
		host_supported: true,

		srcs: [
		"FLACDecoder.cpp",
		@@ -33,6 +34,13 @@ cc_library {
		],

		header_libs: [
		"libmedia_headers",
		"libstagefright_foundation_headers",
		"libstagefright_headers",
		],

		target: {
		darwin: {
		enabled: false,
		},
		},
		}