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

Commit 1495f5db authored by Lorena Torres-Huerta's avatar Lorena Torres-Huerta Committed by Gerrit Code Review
Browse files

Merge changes from topic "media_common_types_version_bump" 

* changes:
  Use explicit aidl versions for audio hal and soundtrigger dependencies.
  Add AudioAttributes and AudioFlag for use in HAL interface for engine configuration.
parents 11f9267f 9b452d4c

media/libaaudio/fuzzer/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ package { 


cc_fuzz {

    name: "libaaudio_fuzzer",

    defaults: [

        "latest_android_media_audio_common_types_cpp_static",

    ],

    srcs: [

        "libaaudio_fuzzer.cpp",

    ],
@@ -39,7 +42,6 @@ cc_fuzz { 
        "libutils",

    ],

    static_libs: [

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

        "liblog",

        "libcutils",

        "libaaudio",

media/libaaudio/src/Android.bp

+5 −2
Original line number Diff line number Diff line
@@ -134,6 +134,10 @@ cc_library { 
cc_library {

    name: "libaaudio_internal",



    defaults: [

        "latest_android_media_audio_common_types_cpp_shared",

    ],



    local_include_dirs: [

        "binding",

        "client",
@@ -167,7 +171,6 @@ cc_library { 
        "libbinder",

        "framework-permission-aidl-cpp",

        "aaudio-aidl-cpp",

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

        "audioclient-types-aidl-cpp",

        "libaudioclient_aidl_conversion",

    ],
@@ -260,7 +263,7 @@ aidl_interface { 
        "binding/aidl/aaudio/IAAudioService.aidl",

    ],

    imports: [

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

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

        "audioclient-types-aidl",

        "shared-file-region-aidl",

        "framework-permission-aidl",

media/libaudioclient/Android.bp

+14 −10
Original line number Diff line number Diff line
@@ -54,8 +54,10 @@ cc_library { 
        "AudioVolumeGroup.cpp",

        "PolicyAidlConversion.cpp"

    ],

    defaults: [

        "latest_android_media_audio_common_types_cpp_export_shared",

    ],

    shared_libs: [

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

        "audioclient-types-aidl-cpp",

        "audioflinger-aidl-cpp",

        "audiopolicy-aidl-cpp",
@@ -76,7 +78,6 @@ cc_library { 
    include_dirs: ["system/media/audio_utils/include"],

    export_include_dirs: ["include"],

    export_shared_lib_headers: [

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

        "audioclient-types-aidl-cpp",

        "audioflinger-aidl-cpp",

        "audiopolicy-aidl-cpp",
@@ -116,8 +117,10 @@ cc_library { 
        "RecordingActivityTracker.cpp",

        "TrackPlayerBase.cpp",

    ],

    defaults: [

        "latest_android_media_audio_common_types_cpp_shared",

    ],

    shared_libs: [

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

        "audioclient-types-aidl-cpp",

        "audioflinger-aidl-cpp",

        "audiopolicy-aidl-cpp",
@@ -237,8 +240,10 @@ cc_library { 
    export_header_lib_headers: [

        "libaudioclient_aidl_conversion_util",

    ],

    defaults: [

        "latest_android_media_audio_common_types_cpp_export_shared",

    ],

    shared_libs: [

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

        "audioclient-types-aidl-cpp",

        "libbase",

        "libbinder",
@@ -250,7 +255,6 @@ cc_library { 
        "framework-permission-aidl-cpp",

    ],

    export_shared_lib_headers: [

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

        "audioclient-types-aidl-cpp",

        "libbase",

        "shared-file-region-aidl-cpp",
@@ -307,7 +311,7 @@ aidl_interface { 
        "aidl/android/media/IEffectClient.aidl",

    ],

    imports: [

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

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

        "shared-file-region-aidl",

    ],

    backend: {
@@ -360,7 +364,7 @@ aidl_interface { 
        "aidl/android/media/TrackSecondaryOutputInfo.aidl",

    ],

    imports: [

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

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

        "framework-permission-aidl",

    ],

    backend: {
@@ -404,7 +408,7 @@ aidl_interface { 
        "aidl/android/media/SpatializerHeadTrackingMode.aidl",

    ],

    imports: [

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

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

        "audioclient-types-aidl",

    ],

    backend: {
@@ -447,7 +451,7 @@ aidl_interface { 
        "aidl/android/media/IAudioTrackCallback.aidl",

    ],

    imports: [

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

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

        "audioclient-types-aidl",

        "av-types-aidl",

        "effect-aidl",
@@ -484,7 +488,7 @@ aidl_interface { 
        "aidl/android/media/IAudioPolicyServiceClient.aidl",

    ],

    imports: [

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

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

        "audioclient-types-aidl",

        "audiopolicy-types-aidl",

        "capture_state_listener-aidl",

media/libaudioclient/fuzzer/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ package { 


cc_fuzz {

    name: "audioflinger_fuzzer",

    defaults: [

        "latest_android_media_audio_common_types_cpp_shared",

    ],

    srcs: [

        "audioflinger_fuzzer.cpp",

    ],
@@ -46,7 +49,6 @@ cc_fuzz { 
    ],

    shared_libs: [

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

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

        "audioclient-types-aidl-cpp",

        "audioflinger-aidl-cpp",

        "audiopolicy-aidl-cpp",

media/libaudioclient/tests/Android.bp

+7 −3
Original line number Diff line number Diff line
@@ -24,7 +24,10 @@ cc_defaults { 


cc_test {

    name: "audio_aidl_conversion_tests",

    defaults: ["libaudioclient_tests_defaults"],

    defaults: [

        "libaudioclient_tests_defaults",

        "latest_android_media_audio_common_types_cpp_static",

    ],

    srcs: ["audio_aidl_legacy_conversion_tests.cpp"],

    shared_libs: [

        "libbinder",
@@ -33,7 +36,6 @@ cc_test { 
        "libutils",

    ],

    static_libs: [

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

        "audioclient-types-aidl-cpp",

        "libaudioclient_aidl_conversion",

        "libstagefright_foundation",
@@ -100,6 +102,9 @@ cc_defaults { 
        "-Wall",

        "-Werror",

    ],

    defaults: [

        "latest_android_media_audio_common_types_cpp_static",

    ],

    shared_libs: [

        "capture_state_listener-aidl-cpp",

        "framework-permission-aidl-cpp",
@@ -125,7 +130,6 @@ cc_defaults { 
    ],

    static_libs: [

        "android.hardware.audio.common@7.0-enums",

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

        "audioclient-types-aidl-cpp",

        "audioflinger-aidl-cpp",

        "audiopolicy-aidl-cpp",