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

Commit 9672c53b authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android (Google) Code Review
Browse files

Merge changes from topic "audio-v6" 

* changes:
  Support Audio HAL V6
  Rename of the Vendor HAL
parents 7b129961 a4026674

media/audioserver/audioserver.rc

+3 −3
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ service audioserver /system/bin/audioserver 
    capabilities BLOCK_SUSPEND

    ioprio rt 4

    writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks

    onrestart restart vendor.audio-hal-2-0

    onrestart restart vendor.audio-hal

    onrestart restart vendor.audio-hal-4-0-msd

    # Keep the original service name for backward compatibility when upgrading

    # O-MR1 devices with framework-only.

    # Keep the original service names for backward compatibility

    onrestart restart vendor.audio-hal-2-0

    onrestart restart audio-hal-2-0



on property:vts.native_server.on=1

media/libaudiohal/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ cc_library_shared { 
        "libaudiohal@2.0",

        "libaudiohal@4.0",

        "libaudiohal@5.0",

        "libaudiohal@6.0",

        "libutils",

    ],

media/libaudiohal/impl/Android.bp

+17 −0
Original line number Diff line number Diff line
@@ -99,3 +99,20 @@ cc_library_shared { 
        "-include common/all-versions/VersionMacro.h",

    ]

}



cc_library_shared {

    name: "libaudiohal@6.0",

    defaults: ["libaudiohal_default"],

    shared_libs: [

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

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

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

        "android.hardware.audio@6.0",

    ],

    cflags: [

        "-DMAJOR_VERSION=6",

        "-DMINOR_VERSION=0",

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

    ]

}

media/libaudiohal/impl/include/libaudiohal/FactoryHalHidl.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ namespace android { 
 * the preferred available impl.

 */

enum class AudioHALVersion {

    V6_0,

    V5_0,

    V4_0,

    V2_0,