Commit c25e2bf6 authored Feb 14, 2022 by Colin Cross

libmpeg2extractor: add dependency on libmedia_helper

libstagefright_mpeg2extractor references android::AudioParameter,
which is defined in libmedia_helper.  Builds with CFI drop the
dependency, likely due to implicitly enabling LTO.  Builds with musl
that don't support CFI fail with:

ld.lld: error: undefined symbol: vtable for android::AudioParameter
>>> referenced by AudioParameter.h:29 (frameworks/av/media/libmediahelper/include/media/AudioParameter.h:29)
>>>               Utils.o:(android::sendMetaDataToHal(android::sp<android::MediaPlayerBase::AudioSink>&, android::sp<android::MetaData> const&)) in archive out/soong/.intermediates/frameworks/av/media/libstagefright/libstagefright_mpeg2extractor/linux_musl_x86_64_static/libstagefright_mpeg2extractor.

Bug: 216192129
Test: m USE_HOST_MUSL=true host-native
Change-Id: I12e8580cc16eee643dbd890a920785680d3e4700

parent 80dfa914

media/extractors/mpeg2/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ cc_library {
		"libhidlbase",
		"libhidlmemory",
		"libjsoncpp",
		"libmedia_helper",
		"libprocessgroup",
		"libstagefright_esds",
		"libstagefright_foundation_without_imemory",

media/libmediahelper/Android.bp

+6 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ cc_library_headers {
		cc_library {
		name: "libmedia_helper",
		vendor_available: true,
		min_sdk_version: "29",
		vndk: {
		enabled: true,
		},
		@@ -58,4 +59,9 @@ cc_library {
		enabled: false,
		},
		},
		apex_available: [
		"//apex_available:platform",
		"com.android.media",
		"test_com.android.media",
		],
		}