Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca63a366 authored by Shunkai Yao's avatar Shunkai Yao Committed by Android (Google) Code Review
Browse files

Merge "Add defaults for audio AIDL interfaces" into aosp-main-future

parents 36c4e67e 95732c6c

audio/aidl/Android.bp

+51 −20
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ aidl_interface { 
    name: "android.hardware.audio.common",

    defaults: [

        "android.hardware.audio_defaults",

        "latest_android_media_audio_common_types_import_interface",

    ],

    srcs: [

        "android/hardware/audio/common/AudioOffloadMetadata.aidl",
@@ -42,10 +43,7 @@ aidl_interface { 
        "android/hardware/audio/common/SinkMetadata.aidl",

        "android/hardware/audio/common/SourceMetadata.aidl",

    ],

    frozen: true,

    imports: [

        "android.media.audio.common.types-V2",

    ],

    frozen: false,

    backend: {

        cpp: {

            enabled: true,
@@ -83,7 +81,7 @@ 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-V3"



// Modules that depend on android.hardware.audio.common directly can include

// the following cc_defaults to avoid explicitly managing dependency versions
@@ -109,10 +107,21 @@ cc_defaults { 
    ],

}



aidl_interface_defaults {

    name: "latest_android_hardware_audio_common_import_interface",

    imports: [

        latest_android_hardware_audio_common,

    ],

}



aidl_interface {

    name: "android.hardware.audio.core",

    defaults: [

        "android.hardware.audio_defaults",

        "latest_android_hardware_audio_common_import_interface",

        "latest_android_hardware_audio_core_sounddose_import_interface",

        "latest_android_hardware_audio_effect_import_interface",

        "latest_android_media_audio_common_types_import_interface",

    ],

    srcs: [

        "android/hardware/audio/core/AudioPatch.aidl",
@@ -137,10 +146,6 @@ aidl_interface { 
    imports: [

        "android.hardware.common-V2",

        "android.hardware.common.fmq-V1",

        "android.hardware.audio.common-V2",

        "android.hardware.audio.core.sounddose-V1",

        "android.hardware.audio.effect-V1",

        "android.media.audio.common.types-V2",

    ],

    backend: {

        // The C++ backend is disabled transitively due to use of FMQ.
@@ -167,11 +172,11 @@ aidl_interface { 
        // IMPORTANT: Update latest_android_hardware_audio_core every time you

        // add the latest frozen version to versions_with_info

    ],

    frozen: true,

    frozen: false,

}



// Note: This should always be one version ahead of the last frozen version

latest_android_hardware_audio_core = "android.hardware.audio.core-V1"

latest_android_hardware_audio_core = "android.hardware.audio.core-V2"



// Modules that depend on android.hardware.audio.core directly can include

// the following cc_defaults to avoid explicitly managing dependency versions
@@ -190,18 +195,23 @@ cc_defaults { 
    ],

}



aidl_interface_defaults {

    name: "latest_android_hardware_audio_core_import_interface",

    imports: [

        latest_android_hardware_audio_core,

    ],

}



// Used for the standalone sounddose HAL

aidl_interface {

    name: "android.hardware.audio.core.sounddose",

    defaults: [

        "android.hardware.audio_defaults",

        "latest_android_media_audio_common_types_import_interface",

    ],

    srcs: [

        "android/hardware/audio/core/sounddose/ISoundDose.aidl",

    ],

    imports: [

        "android.media.audio.common.types-V2",

    ],

    backend: {

        // The C++ backend is disabled transitively due to use of FMQ by the core HAL.

        cpp: {
@@ -220,11 +230,11 @@ aidl_interface { 
        // IMPORTANT: Update latest_android_hardware_audio_core_sounddose every time you

        // add the latest frozen version to versions_with_info

    ],

    frozen: true,

    frozen: false,

}



// Note: This should always be one version ahead of the last frozen version

latest_android_hardware_audio_core_sounddose = "android.hardware.audio.core.sounddose-V1"

latest_android_hardware_audio_core_sounddose = "android.hardware.audio.core.sounddose-V2"



// Modules that depend on android.hardware.audio.core.sounddose directly can include

// the following cc_defaults to avoid explicitly managing dependency versions
@@ -236,6 +246,13 @@ cc_defaults { 
    ],

}



cc_defaults {

    name: "latest_android_hardware_audio_core_sounddose_ndk_export_shared_lib_header",

    export_shared_lib_headers: [

        latest_android_hardware_audio_core_sounddose + "-ndk",

    ],

}



cc_defaults {

    name: "latest_android_hardware_audio_core_sounddose_ndk_static",

    static_libs: [
@@ -243,10 +260,19 @@ cc_defaults { 
    ],

}



aidl_interface_defaults {

    name: "latest_android_hardware_audio_core_sounddose_import_interface",

    imports: [

        latest_android_hardware_audio_core_sounddose,

    ],

}



aidl_interface {

    name: "android.hardware.audio.effect",

    defaults: [

        "android.hardware.audio_defaults",

        "latest_android_hardware_audio_common_import_interface",

        "latest_android_media_audio_common_types_import_interface",

    ],

    srcs: [

        "android/hardware/audio/effect/AcousticEchoCanceler.aidl",
@@ -280,8 +306,6 @@ aidl_interface { 
    imports: [

        "android.hardware.common-V2",

        "android.hardware.common.fmq-V1",

        "android.hardware.audio.common-V2",

        "android.media.audio.common.types-V2",

    ],

    backend: {

        // The C++ backend is disabled transitively due to use of FMQ.
@@ -303,11 +327,11 @@ aidl_interface { 
            ],

        },

    ],

    frozen: true,

    frozen: false,



}



latest_android_hardware_audio_effect = "android.hardware.audio.effect-V1"

latest_android_hardware_audio_effect = "android.hardware.audio.effect-V2"



cc_defaults {

    name: "latest_android_hardware_audio_effect_ndk_shared",
@@ -322,3 +346,10 @@ cc_defaults { 
        latest_android_hardware_audio_effect + "-ndk",

    ],

}



aidl_interface_defaults {

    name: "latest_android_hardware_audio_effect_import_interface",

    imports: [

        latest_android_hardware_audio_effect,

    ],

}

audio/aidl/common/Android.bp

+5 −3
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ cc_library { 
    name: "libaudioaidlranges",

    host_supported: true,

    vendor_available: true,

    static_libs: [

        "android.hardware.audio.effect-V1-ndk",

    defaults: [

        "latest_android_hardware_audio_effect_ndk_shared",

    ],

    export_include_dirs: ["include"],

    header_libs: ["libaudioaidl_headers"],
@@ -59,8 +59,10 @@ cc_test { 
    name: "libaudioaidlcommon_test",

    host_supported: true,

    vendor_available: true,

    defaults: [

        "latest_android_media_audio_common_types_ndk_static",

    ],

    static_libs: [

        "android.media.audio.common.types-V1-ndk",

        "libaudioaidlcommon",

    ],

    shared_libs: [

audio/aidl/default/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ cc_library { 
        "latest_android_media_audio_common_types_ndk_shared",

        "latest_android_hardware_audio_core_ndk_shared",

        "latest_android_hardware_audio_core_sounddose_ndk_shared",

        "latest_android_hardware_bluetooth_audio_ndk_shared",

    ],

    export_include_dirs: ["include"],

    srcs: [
@@ -93,7 +94,6 @@ cc_library { 
        "audio_policy_engine_configuration_aidl_default",

    ],

    shared_libs: [

        "android.hardware.bluetooth.audio-V3-ndk",

        "libaudio_aidl_conversion_common_ndk",

        "libbluetooth_audio_session_aidl",

        "libmedia_helper",
@@ -118,15 +118,15 @@ cc_binary { 
    vintf_fragments: ["android.hardware.audio.service-aidl.xml"],

    defaults: [

        "aidlaudioservice_defaults",

        "latest_android_media_audio_common_types_ndk_shared",

        "latest_android_hardware_audio_core_sounddose_ndk_shared",

        "latest_android_hardware_audio_core_ndk_shared",

        "latest_android_hardware_bluetooth_audio_ndk_shared",

        "latest_android_media_audio_common_types_ndk_shared",

    ],

    static_libs: [

        "libaudioserviceexampleimpl",

    ],

    shared_libs: [

        "android.hardware.bluetooth.audio-V3-ndk",

        "libaudio_aidl_conversion_common_ndk",

        "libbluetooth_audio_session_aidl",

        "libmedia_helper",

audio/aidl/default/android.hardware.audio.effect.service-aidl.xml

+1 −1
Original line number Diff line number Diff line 
<manifest version="1.0" type="device">

  <hal format="aidl">

    <name>android.hardware.audio.effect</name>

    <version>1</version>

    <version>2</version>

    <fqname>IFactory/default</fqname>

  </hal>

</manifest>

audio/aidl/default/android.hardware.audio.service-aidl.xml

+4 −4
Original line number Diff line number Diff line 
<manifest version="1.0" type="device">

  <hal format="aidl">

    <name>android.hardware.audio.core</name>

    <version>1</version>

    <version>2</version>

    <fqname>IModule/default</fqname>

  </hal>

  <hal format="aidl">

    <name>android.hardware.audio.core</name>

    <version>1</version>

    <version>2</version>

    <fqname>IModule/r_submix</fqname>

  </hal>

  <hal format="aidl">

    <name>android.hardware.audio.core</name>

    <version>1</version>

    <version>2</version>

    <fqname>IModule/bluetooth</fqname>

  </hal>

  <hal format="aidl">

    <name>android.hardware.audio.core</name>

    <version>1</version>

    <version>2</version>

    <fqname>IConfig/default</fqname>

  </hal>

  <!-- Uncomment when these modules present in the configuration