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

Commit cf273e12 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 70991456 559e9765

media/libaudiohal/Android.bp

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



    required: [

        "libaudiohal@5.0",

        "libaudiohal@6.0",

        "libaudiohal@7.0",

        "libaudiohal@7.1",

media/libaudiohal/FactoryHal.cpp

+1 −2
Original line number Diff line number Diff line
@@ -50,12 +50,11 @@ 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, 5> sAudioHALVersions = {

static const std::array<AudioHalVersionInfo, 4> 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),

};



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@5.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@5.0",

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

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

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

        "android.hardware.audio@5.0",

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

    ],

    cflags: [

        "-DMAJOR_VERSION=5",

        "-DMINOR_VERSION=0",

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

    ],

}



cc_library_shared {

    name: "libaudiohal@6.0",

    defaults: [