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

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

Merge changes from topic "fixAudioAidlVersions-tm-dev-plus-aosp" into... 

Merge changes from topic "fixAudioAidlVersions-tm-dev-plus-aosp" into tm-dev-plus-aosp am: 71052c75 am: a4735bf9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19875061



Change-Id: Id53b5cacec09793ba07687205a0980d2ce54d400
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99805655 a4735bf9

media/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ aidl_interface { 
        "aidl/android/media/soundtrigger_middleware/SoundTriggerModuleDescriptor.aidl",

    ],

    imports: [

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

        "android.media.soundtrigger.types",

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

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

        "media_permission-aidl",

    ],

}
@@ -232,12 +232,12 @@ aidl_interface { 
        },

    },

    imports: [

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

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

    ],

    versions_with_info: [

        {

            version: "1",

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

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

        },

    ],