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

Commit f92d5be3 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Gerrit Code Review
Browse files

Merge "Remove framework support for audio HIDL HAL V4" into main

parents bcab3222 5e327e94

media/libaudiohal/Android.bp

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



    required: [

        "libaudiohal@4.0",

        "libaudiohal@5.0",

        "libaudiohal@6.0",

        "libaudiohal@7.0",

media/libaudiohal/FactoryHal.cpp

+1 −2
Original line number Diff line number Diff line
@@ -50,13 +50,12 @@ using InterfaceName = std::pair<std::string, std::string>; 
 * This list need to keep sync with AudioHalVersionInfo.VERSIONS in

 * media/java/android/media/AudioHalVersionInfo.java.

 */

static const std::array<AudioHalVersionInfo, 6> sAudioHALVersions = {

static const std::array<AudioHalVersionInfo, 5> sAudioHALVersions = {

    AudioHalVersionInfo(AudioHalVersionInfo::Type::AIDL, 1, 0),

    AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 7, 1),

    AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 7, 0),

    AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 6, 0),

    AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 5, 0),

    AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, 4, 0),

};



static const std::map<AudioHalVersionInfo::Type, InterfaceName> sDevicesHALInterfaces = {

media/libaudiohal/impl/Android.bp

+0 −26
Original line number Diff line number Diff line
@@ -82,32 +82,6 @@ cc_defaults { 
    ],

}



cc_library_shared {

    name: "libaudiohal@4.0",

    defaults: [

        "libaudiohal_default",

        "libaudiohal_hidl_default"

    ],

    srcs: [

        ":audio_core_hal_client_sources",

        ":audio_effect_hidl_hal_client_sources",

        "EffectsFactoryHalEntry.cpp",

    ],

    shared_libs: [

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

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

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

        "android.hardware.audio.effect@4.0-util",

        "android.hardware.audio@4.0",

        "android.hardware.audio@4.0-util",

    ],

    cflags: [

        "-DMAJOR_VERSION=4",

        "-DMINOR_VERSION=0",

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

    ]

}



cc_library_shared {

    name: "libaudiohal@5.0",

    defaults: [