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

Commit 9c8792bd authored Jul 11, 2019 by Inseob Kim

Fix vendor modules to use shared vndk

When using VNDK, Vendor modules should use shared version.

Bug: 137178339
Test: m && boot blueline
Change-Id: Iaf6029ca4ded12b1b7a04a59b26fda33dcb3d071

parent 8cfe8f7b

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/extractors/mkv/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,10 +12,10 @@ cc_library_shared {
		shared_libs: [
		"liblog",
		"libmediandk",
		"libstagefright_flacdec",
		],

		static_libs: [
		"libstagefright_flacdec",
		"libstagefright_foundation",
		"libstagefright_metadatautils",
		"libwebm",

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

+10 −19

Original line number	Diff line number	Diff line
		cc_library {
		cc_library_shared {
		name: "libstagefright_flacdec",
		vendor_available: true,

		@@ -18,29 +18,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",
		],
		}