Merge "Use explicit aidl versions for audio hal and soundtrigger dependencies." (ee3b990b) · Commits · e / os / android_hardware_interfaces

audio/aidl/Android.bp

+13 −6

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,7 @@ aidl_interface {
	"android/hardware/audio/common/SourceMetadata.aidl",		"android/hardware/audio/common/SourceMetadata.aidl",
	],		],
	imports: [		imports: [
	"android.media.audio.common.types",		"android.media.audio.common.types-V2",
	],		],
	stability: "vintf",		stability: "vintf",
	backend: {		backend: {
	@@ -59,7 +59,7 @@ aidl_interface {
	versions_with_info: [		versions_with_info: [
	{		{
	version: "1",		version: "1",
	imports: ["android.media.audio.common.types-V1"],		imports: ["android.media.audio.common.types-V2"],
	},		},
	// IMPORTANT: Update latest_android_hardware_audio_common every time you		// IMPORTANT: Update latest_android_hardware_audio_common every time you
	// add the latest frozen version to versions_with_info		// add the latest frozen version to versions_with_info
	@@ -68,11 +68,18 @@ aidl_interface {
	}		}

	// Note: This should always be one version ahead of the last frozen version		// Note: This should always be one version ahead of the last frozen version
	latest_android_hardware_audio_common = "android.hardware.audio.common-V2"		latest_android_hardware_audio_common = "android.hardware.audio.common-V1"

	// Modules that depend on android.hardware.audio.common directly can include		// Modules that depend on android.hardware.audio.common directly can include
	// the following cc_defaults to avoid explicitly managing dependency versions		// the following cc_defaults to avoid explicitly managing dependency versions
	// across many scattered files.		// across many scattered files.
			cc_defaults {
			name: "latest_android_hardware_audio_common_cpp_static",
			static_libs: [
			latest_android_hardware_audio_common + "-cpp",
			],
			}

	cc_defaults {		cc_defaults {
	name: "latest_android_hardware_audio_common_ndk_static",		name: "latest_android_hardware_audio_common_ndk_static",
	static_libs: [		static_libs: [
	@@ -97,8 +104,8 @@ aidl_interface {
	imports: [		imports: [
	"android.hardware.common-V2",		"android.hardware.common-V2",
	"android.hardware.common.fmq-V1",		"android.hardware.common.fmq-V1",
	"android.hardware.audio.common",		"android.hardware.audio.common-V1",
	"android.media.audio.common.types",		"android.media.audio.common.types-V2",
	],		],
	stability: "vintf",		stability: "vintf",
	backend: {		backend: {
	@@ -145,7 +152,7 @@ aidl_interface {
	],		],
	imports: [		imports: [
	"android.hardware.audio.common-V1",		"android.hardware.audio.common-V1",
	"android.media.audio.common.types-V1",		"android.media.audio.common.types-V2",
	],		],
	stability: "vintf",		stability: "vintf",
	backend: {		backend: {

audio/aidl/default/Android.bp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,11 +60,13 @@ cc_binary {

	cc_defaults {		cc_defaults {
	name: "aidlaudioeffectservice_defaults",		name: "aidlaudioeffectservice_defaults",
			defaults: [
			"latest_android_media_audio_common_types_ndk_shared",
			],
	vendor: true,		vendor: true,
	shared_libs: [		shared_libs: [
	"libbase",		"libbase",
	"libbinder_ndk",		"libbinder_ndk",
	"android.media.audio.common.types-V1-ndk",
	"android.hardware.audio.effect-V1-ndk",		"android.hardware.audio.effect-V1-ndk",
	],		],
	cflags: [		cflags: [

audio/aidl/vts/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,7 @@ cc_test {
	cc_test {		cc_test {
	name: "VtsHalAudioEffectTargetTest",		name: "VtsHalAudioEffectTargetTest",
	defaults: [		defaults: [
			"latest_android_media_audio_common_types_ndk_static",
	"VtsHalTargetTestDefaults",		"VtsHalTargetTestDefaults",
	"use_libaidlvintf_gtest_helper_static",		"use_libaidlvintf_gtest_helper_static",
	],		],
	@@ -55,7 +56,6 @@ cc_test {
	"libbinder_ndk",		"libbinder_ndk",
	],		],
	static_libs: [		static_libs: [
	"android.media.audio.common.types-V1-ndk",
	"android.hardware.audio.effect-V1-ndk",		"android.hardware.audio.effect-V1-ndk",
	],		],
	cflags: [		cflags: [

automotive/audiocontrol/aidl/Android.bp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@ aidl_interface {
	srcs: ["android/hardware/automotive/audiocontrol/*.aidl"],		srcs: ["android/hardware/automotive/audiocontrol/*.aidl"],
	imports: [		imports: [
	"android.hardware.audio.common-V1",		"android.hardware.audio.common-V1",
	"android.media.audio.common.types-V1",		"android.media.audio.common.types-V2",
	],		],
	stability: "vintf",		stability: "vintf",
	backend: {		backend: {
	@@ -33,14 +33,14 @@ aidl_interface {
	version: "1",		version: "1",
	imports: [		imports: [
	"android.hardware.audio.common-V1",		"android.hardware.audio.common-V1",
	"android.media.audio.common.types-V1",		"android.media.audio.common.types-V2",
	],		],
	},		},
	{		{
	version: "2",		version: "2",
	imports: [		imports: [
	"android.hardware.audio.common-V1",		"android.hardware.audio.common-V1",
	"android.media.audio.common.types-V1",		"android.media.audio.common.types-V2",
	],		],
	},		},

automotive/audiocontrol/aidl/vts/Android.bp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,8 @@ package {
	cc_test {		cc_test {
	name: "VtsAidlHalAudioControlTest",		name: "VtsAidlHalAudioControlTest",
	defaults: [		defaults: [
			"latest_android_media_audio_common_types_cpp_static",
			"latest_android_hardware_audio_common_cpp_static",
	"VtsHalTargetTestDefaults",		"VtsHalTargetTestDefaults",
	"use_libaidlvintf_gtest_helper_static",		"use_libaidlvintf_gtest_helper_static",
	],		],
	@@ -38,8 +40,6 @@ cc_test {
	],		],
	static_libs: [		static_libs: [
	"android.hardware.automotive.audiocontrol-V2-cpp",		"android.hardware.automotive.audiocontrol-V2-cpp",
	"android.hardware.audio.common-V1-cpp",
	"android.media.audio.common.types-V1-cpp",
	"libgmock",		"libgmock",
	],		],
	test_suites: [		test_suites: [