Merge "Only add the AIDL manifest decl when using unfrozen" into main (d5302433) · Commits · e / os / android_frameworks_av

media/mediaserver/Android.bp

+10 −2

Original line number	Diff line number	Diff line

		package {
		default_applicable_licenses: ["frameworks_av_media_mediaserver_license"],
		}
		@@ -86,7 +85,16 @@ mediaserver_cc_binary {
		"-Wall",
		],

		vintf_fragments: ["manifest_media_c2_software.xml"],
		// AIDL is only used when release_aidl_use_unfrozen is true
		// because the swcodec mainline module is a prebuilt from an
		// Android U branch in that case.
		// TODO(b/327508501)
		vintf_fragments: ["manifest_media_c2_software_hidl.xml"],
		product_variables: {
		release_aidl_use_unfrozen: {
		vintf_fragments: ["manifest_media_c2_software_aidl.xml"],
		},
		},

		soong_config_variables: {
		TARGET_DYNAMIC_64_32_MEDIASERVER: {

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		<manifest version="1.0" type="framework">
		<hal format="aidl">
		<name>android.hardware.media.c2</name>
		<version>1</version>
		<fqname>IComponentStore/software</fqname>
		</hal>
		</manifest>

+0 −5

Original line number	Diff line number	Diff line
		@@ -8,9 +8,4 @@
		<instance>software</instance>
		</interface>
		</hal>
		<hal format="aidl">
		<name>android.hardware.media.c2</name>
		<version>1</version>
		<fqname>IComponentStore/software</fqname>
		</hal>
		</manifest>