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

Commit b0a51cdc authored Jun 08, 2020 by Kris Alder Committed by Automerger Merge Worker Jun 08, 2020

Merge "Fix vendor modules to use shared vndk" am: ed2b8f23

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

Change-Id: I051cf56a1213d777af5e7d44c3019d0e5380e72c

parents d6fbd84b ed2b8f23

media/codec2/components/flac/Android.bp

+4 −1

Original line number	Diff line number	Diff line
		@@ -23,8 +23,11 @@ cc_library_shared {

		srcs: ["C2SoftFlacEnc.cpp"],

		static_libs: [
		shared_libs: [
		"libaudioutils",
		],

		static_libs: [
		"libFLAC",
		],
		}

media/libeffects/downmix/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ cc_library_shared {
		srcs: ["EffectDownmix.c"],

		shared_libs: [
		"libaudioutils",
		"libcutils",
		"liblog",
		],
		@@ -23,5 +24,4 @@ cc_library_shared {
		"libaudioeffects",
		"libhardware_headers",
		],
		static_libs: ["libaudioutils" ],
		}

media/libstagefright/codecs/flac/enc/Android.bp

+3 −1

Original line number	Diff line number	Diff line
		@@ -15,8 +15,10 @@ cc_library_shared {
		},

		header_libs: ["libbase_headers"],
		static_libs: [
		shared_libs: [
		"libaudioutils",
		],
		static_libs: [
		"libFLAC",
		],
		}

media/libstagefright/flac/dec/Android.bp

+9 −18

Original line number	Diff line number	Diff line
		@@ -19,29 +19,20 @@ cc_library {
		cfi: true,
		},

		static: {
		whole_static_libs: [
		"libFLAC",
		shared_libs: [
		"libaudioutils",
		"liblog",
		],
		},

		shared: {
		static_libs: [
		"libFLAC",
		"libaudioutils",
		],

		export_static_lib_headers: [
		"libFLAC",
		],
		},

		shared_libs: [
		"liblog",
		],

		header_libs: [
		"libmedia_headers",
		"libFLAC-headers",
		],
		}