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

Commit 88cab4d4 authored by Lorena Torres-Huerta's avatar Lorena Torres-Huerta Committed by Automerger Merge Worker
Browse files

Merge changes from topic "media_common_types_version_bump" am: 1495f5db 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2203457



Change-Id: Ibbfd6e6275a3352da4a5cb5b4c23fdb56c7855ae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85297887 1495f5db

media/libaaudio/src/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ aidl_interface { 
        "binding/aidl/aaudio/IAAudioService.aidl",

    ],

    imports: [

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

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

        "audioclient-types-aidl",

        "shared-file-region-aidl",

        "framework-permission-aidl",

media/libaudioclient/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ aidl_interface { 
        "aidl/android/media/TrackSecondaryOutputInfo.aidl",

    ],

    imports: [

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

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

        "framework-permission-aidl",

    ],

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

    ],

    imports: [

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

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

        "audioclient-types-aidl",

    ],

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

    ],

    imports: [

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

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

        "audioclient-types-aidl",

        "av-types-aidl",

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

    ],

    imports: [

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

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

        "audioclient-types-aidl",

        "audiopolicy-types-aidl",

        "capture_state_listener-aidl",