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

Commit 9ae4f224 authored by Lorena Torres-Huerta's avatar Lorena Torres-Huerta
Browse files

Add AudioAttributes and AudioFlag for use in HAL interface for engine configuration. 

This requires a version bump to android.media.audio.common.types.

cc_defaults and java_defaults are used in order to avoid explicitly updating version references in several Android.bp files when we do future version bumps.

Bug: 242678729
Test: m
Merged-In: Id17820f210f625e370992db4f9f85e37887b088b
Change-Id: Id17820f210f625e370992db4f9f85e37887b088b
(cherry picked from commit bf94fa32)
parent 43f9a07e

audio/aidl/Android.bp

+42 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ aidl_interface { 
        "android/hardware/audio/common/SourceMetadata.aidl",

    ],

    imports: [

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

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

    ],

    stability: "vintf",

    backend: {
@@ -61,10 +61,25 @@ aidl_interface { 
            version: "1",

            imports: ["android.media.audio.common.types-V1"],

        },

        // IMPORTANT: Update latest_android_hardware_audio_common every time you

        // add the latest frozen version to versions_with_info

    ],



}



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

latest_android_hardware_audio_common = "android.hardware.audio.common-V2"



// 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_ndk_static",

    static_libs: [

        latest_android_hardware_audio_common + "-ndk",

    ],

}



aidl_interface {

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

    vendor_available: true,
@@ -80,10 +95,10 @@ aidl_interface { 
        "android/hardware/audio/core/StreamDescriptor.aidl",

    ],

    imports: [

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

        "android.hardware.common-V2",

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

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

        "android.hardware.audio.common",

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

    ],

    stability: "vintf",

    backend: {
@@ -95,6 +110,30 @@ aidl_interface { 
            sdk_version: "module_current",

        },

    },

    versions_with_info: [

        // IMPORTANT: Update latest_android_hardware_audio_core every time you

        // add the latest frozen version to versions_with_info

    ],

}



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

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



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

// the following cc_defaults to avoid explicitly managing dependency versions

// across many scattered files.

cc_defaults {

    name: "latest_android_hardware_audio_core_ndk_shared",

    shared_libs: [

        latest_android_hardware_audio_core + "-ndk",

    ],

}



cc_defaults {

    name: "latest_android_hardware_audio_core_ndk_static",

    static_libs: [

        latest_android_hardware_audio_core + "-ndk",

    ],

}



aidl_interface {

audio/aidl/default/Android.bp

+10 −4
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ cc_defaults { 
        "libfmq",

        "libstagefright_foundation",

        "libutils",

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

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

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

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

    ],
@@ -27,7 +25,11 @@ cc_defaults { 


cc_library_static {

    name: "libaudioserviceexampleimpl",

    defaults: ["aidlaudioservice_defaults"],

    defaults: [

        "aidlaudioservice_defaults",

        "latest_android_media_audio_common_types_ndk_shared",

        "latest_android_hardware_audio_core_ndk_shared",

    ],

    export_include_dirs: ["include"],

    srcs: [

        "Config.cpp",
@@ -45,7 +47,11 @@ cc_binary { 
    relative_install_path: "hw",

    init_rc: ["android.hardware.audio.service-aidl.example.rc"],

    vintf_fragments: ["android.hardware.audio.service-aidl.xml"],

    defaults: ["aidlaudioservice_defaults"],

    defaults: [

        "aidlaudioservice_defaults",

        "latest_android_media_audio_common_types_ndk_shared",

        "latest_android_hardware_audio_core_ndk_shared",

    ],

    static_libs: [

        "libaudioserviceexampleimpl",

    ],

audio/aidl/vts/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ cc_test { 
    defaults: [

        "VtsHalTargetTestDefaults",

        "use_libaidlvintf_gtest_helper_static",

        "latest_android_hardware_audio_common_ndk_static",

        "latest_android_hardware_audio_core_ndk_static",

        "latest_android_media_audio_common_types_ndk_static",

    ],

    shared_libs: [

        "libbinder_ndk",
@@ -19,11 +22,8 @@ cc_test { 
        "libfmq",

    ],

    static_libs: [

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

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

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

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

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

        "libaudioaidlcommon",

    ],

    cflags: [

audio/core/all-versions/vts/functional/Android.bp

+20 −10
Original line number Diff line number Diff line
@@ -49,7 +49,10 @@ cc_defaults { 


cc_test {

    name: "VtsHalAudioV2_0TargetTest",

    defaults: ["VtsHalAudioTargetTest_defaults"],

    defaults: [

        "VtsHalAudioTargetTest_defaults",

        "latest_android_media_audio_common_types_cpp_static",

    ],

    tidy_timeout_srcs: [

        "2.0/AudioPrimaryHidlHalTest.cpp",

    ],
@@ -62,7 +65,6 @@ cc_test { 
        "libmedia_helper",

        "android.hardware.audio@2.0",

        "android.hardware.audio.common@2.0",

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

    ],

    cflags: [

        "-DMAJOR_VERSION=2",
@@ -79,7 +81,10 @@ cc_test { 


cc_test {

    name: "VtsHalAudioV4_0TargetTest",

    defaults: ["VtsHalAudioTargetTest_defaults"],

    defaults: [

        "VtsHalAudioTargetTest_defaults",

        "latest_android_media_audio_common_types_cpp_static",

    ],

    tidy_timeout_srcs: [

        "4.0/AudioPrimaryHidlHalTest.cpp",

    ],
@@ -92,7 +97,6 @@ cc_test { 
        "libmedia_helper",

        "android.hardware.audio@4.0",

        "android.hardware.audio.common@4.0",

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

    ],

    cflags: [

        "-DMAJOR_VERSION=4",
@@ -109,7 +113,10 @@ cc_test { 


cc_test {

    name: "VtsHalAudioV5_0TargetTest",

    defaults: ["VtsHalAudioTargetTest_defaults"],

    defaults: [

        "VtsHalAudioTargetTest_defaults",

        "latest_android_media_audio_common_types_cpp_static",

    ],

    srcs: [

        "5.0/AudioPrimaryHidlHalTest.cpp",

    ],
@@ -119,7 +126,6 @@ cc_test { 
        "libmedia_helper",

        "android.hardware.audio@5.0",

        "android.hardware.audio.common@5.0",

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

    ],

    cflags: [

        "-DMAJOR_VERSION=5",
@@ -136,7 +142,10 @@ cc_test { 


cc_test {

    name: "VtsHalAudioV6_0TargetTest",

    defaults: ["VtsHalAudioTargetTest_defaults"],

    defaults: [

        "VtsHalAudioTargetTest_defaults",

        "latest_android_media_audio_common_types_cpp_static",

    ],

    tidy_timeout_srcs: [

        "6.0/AudioPrimaryHidlHalTest.cpp",

    ],
@@ -150,7 +159,6 @@ cc_test { 
        "libmedia_helper",

        "android.hardware.audio@6.0",

        "android.hardware.audio.common@6.0",

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

    ],

    cflags: [

        "-DMAJOR_VERSION=6",
@@ -244,7 +252,10 @@ cc_test { 


cc_test {

    name: "HalAudioV6_0GeneratorTest",

    defaults: ["VtsHalAudioTargetTest_defaults"],

    defaults: [

        "VtsHalAudioTargetTest_defaults",

        "latest_android_media_audio_common_types_cpp_static",

    ],

    srcs: [

        "6.0/Generators.cpp",

        "tests/generators_tests.cpp",
@@ -252,7 +263,6 @@ cc_test { 
    static_libs: [

        "android.hardware.audio@6.0",

        "android.hardware.audio.common@6.0",

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

        "libaudiofoundation",

        "libaudiopolicycomponents",

        "libmedia_helper",

soundtrigger/aidl/Android.bp

+15 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ aidl_interface { 
    ],

    stability: "vintf",

    imports: [

        "android.media.soundtrigger.types-V1",

        "android.media.soundtrigger.types",

    ],

    backend: {

        cpp: {
@@ -39,6 +39,20 @@ aidl_interface { 
            version: "1",

            imports: ["android.media.soundtrigger.types-V1"],

        },

        // IMPORTANT: Update latest_android_hardware_soundtrigger3 every time

        // you add the latest frozen version to versions_with_info

    ],

}



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

latest_android_hardware_soundtrigger3 = "android.hardware.soundtrigger3-V2"



// Modules that depend on android.hardware.soundtrigger3 directly can include

// the following java_defaults to avoid explicitly managing dependency versions

// across many scattered files.

java_defaults {

    name: "latest_android_hardware_soundtrigger3_java_static",

    static_libs: [

        latest_android_hardware_soundtrigger3 + "-java",

    ],

}