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

Commit 1c9c1e58 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "Remove support for audio HAL V2 from the framework" am: 56593f4e am: 21567999 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5c0bcc3b8348ce59569cbd0378c00c670f0ea9d
parents 30321b84 21567999

media/libaudiohal/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ cc_library_shared { 
    ],



    required: [

        "libaudiohal@2.0",

        "libaudiohal@4.0",

        "libaudiohal@5.0",

        "libaudiohal@6.0",

media/libaudiohal/FactoryHalHidl.cpp

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ const char* sAudioHALVersions[] = { 
    "6.0",

    "5.0",

    "4.0",

    "2.0",

    nullptr

};

media/libaudiohal/impl/Android.bp

+0 −16
Original line number Diff line number Diff line
@@ -52,22 +52,6 @@ cc_defaults { 
    ],

}



cc_library_shared {

    name: "libaudiohal@2.0",

    defaults: ["libaudiohal_default"],

    shared_libs: [

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

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

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

        "android.hardware.audio@2.0",

    ],

    cflags: [

        "-DMAJOR_VERSION=2",

        "-DMINOR_VERSION=0",

        "-include common/all-versions/VersionMacro.h",

    ]

}



cc_library_shared {

    name: "libaudiohal@4.0",

    defaults: ["libaudiohal_default"],