tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use explicit aidl versions for audio hal and soundtrigger dependencies."

Browse source
This commit is contained in:
Lorena Torres-Huerta 2022-08-30 20:18:40 +00:00 committed by Android (Google) Code Review
commit ee3b990b9b
6 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
audio/aidl/Android.bp
View file

@ -33,7 +33,7 @@ aidl_interface {
"android/hardware/audio/common/SourceMetadata.aidl",
],
imports: [
"android.media.audio.common.types",
"android.media.audio.common.types-V2",
],
stability: "vintf",
backend: {
@ -59,7 +59,7 @@ aidl_interface {
versions_with_info: [
{
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
// 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
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
// the following cc_defaults to avoid explicitly managing dependency versions
// across many scattered files.
cc_defaults {
name: "latest_android_hardware_audio_common_cpp_static",
static_libs: [
latest_android_hardware_audio_common + "-cpp",
],
}
cc_defaults {
name: "latest_android_hardware_audio_common_ndk_static",
static_libs: [
@ -97,8 +104,8 @@ aidl_interface {
imports: [
"android.hardware.common-V2",
"android.hardware.common.fmq-V1",
"android.hardware.audio.common",
"android.media.audio.common.types",
"android.hardware.audio.common-V1",
"android.media.audio.common.types-V2",
],
stability: "vintf",
backend: {
@ -145,7 +152,7 @@ aidl_interface {
],
imports: [
"android.hardware.audio.common-V1",
"android.media.audio.common.types-V1",
"android.media.audio.common.types-V2",
],
stability: "vintf",
backend: {

4
audio/aidl/default/Android.bp
View file

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

2
audio/aidl/vts/Android.bp
View file

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

6
automotive/audiocontrol/aidl/Android.bp
View file

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

4
automotive/audiocontrol/aidl/vts/Android.bp
View file

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

4
soundtrigger/aidl/Android.bp
View file

@ -23,7 +23,7 @@ aidl_interface {
],
stability: "vintf",
imports: [
"android.media.soundtrigger.types",
"android.media.soundtrigger.types-V1",
],
backend: {
cpp: {
@ -45,7 +45,7 @@ aidl_interface {
}
// Note: This should always be one version ahead of the last frozen version
latest_android_hardware_soundtrigger3 = "android.hardware.soundtrigger3-V2"
latest_android_hardware_soundtrigger3 = "android.hardware.soundtrigger3-V1"
// Modules that depend on android.hardware.soundtrigger3 directly can include
// the following java_defaults to avoid explicitly managing dependency versions