Merge "spatializer: fix aidl interface dependency" (b2874d1c) · Commits · e / os / android_frameworks_av

media/libaudioclient/Android.bp

+34 −2

Original line number	Diff line number	Diff line
		@@ -25,11 +25,13 @@ cc_library_headers {
		static_libs: [
		"audioflinger-aidl-cpp",
		"audiopolicy-aidl-cpp",
		"spatializer-aidl-cpp",
		"av-types-aidl-cpp",
		],
		export_static_lib_headers: [
		"audioflinger-aidl-cpp",
		"audiopolicy-aidl-cpp",
		"spatializer-aidl-cpp",
		"av-types-aidl-cpp",
		],
		target: {
		@@ -112,6 +114,7 @@ cc_library {
		"audioclient-types-aidl-cpp",
		"audioflinger-aidl-cpp",
		"audiopolicy-aidl-cpp",
		"spatializer-aidl-cpp",
		"audiopolicy-types-aidl-cpp",
		"av-types-aidl-cpp",
		"capture_state_listener-aidl-cpp",
		@@ -137,6 +140,7 @@ cc_library {
		export_shared_lib_headers: [
		"audioflinger-aidl-cpp",
		"audiopolicy-aidl-cpp",
		"spatializer-aidl-cpp",
		"framework-permission-aidl-cpp",
		"libbinder",
		],
		@@ -480,14 +484,42 @@ aidl_interface {
		"aidl/android/media/RecordClientInfo.aidl",
		"aidl/android/media/IAudioPolicyService.aidl",
		"aidl/android/media/IAudioPolicyServiceClient.aidl",
		"aidl/android/media/INativeSpatializerCallback.aidl",
		"aidl/android/media/ISpatializer.aidl",
		],
		imports: [
		"audioclient-types-aidl",
		"audiopolicy-types-aidl",
		"capture_state_listener-aidl",
		"framework-permission-aidl",
		"spatializer-aidl",
		],

		double_loadable: true,
		backend: {
		cpp: {
		min_sdk_version: "29",
		apex_available: [
		"//apex_available:platform",
		"com.android.media",
		],
		},
		java: {
		sdk_version: "module_current",
		},
		},
		}

		aidl_interface {
		name: "spatializer-aidl",
		unstable: true,
		local_include_dir: "aidl",
		host_supported: true,
		vendor_available: true,
		srcs: [
		"aidl/android/media/INativeSpatializerCallback.aidl",
		"aidl/android/media/ISpatializer.aidl",
		],
		imports: [
		"audiopolicy-types-aidl",
		],

		double_loadable: true,

services/audiopolicy/service/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ cc_library_shared {
		"audiopolicy-types-aidl-cpp",
		"capture_state_listener-aidl-cpp",
		"framework-permission-aidl-cpp",
		"spatializer-aidl-cpp",
		],

		static_libs: [