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

Commit 48758573 authored by Kevin Rocard's avatar Kevin Rocard Committed by Android (Google) Code Review
Browse files

Merge changes from topic "audio-hal-v4" 

* changes:
  Audio V4: Split HAL wrapper for versioning
  Audio V4: Move audio HIDL wrapper in a 2.0 folder
  Audio V4: Move Utils in a versioned namespace
parents f83d6ce9 7588ff41

media/libaudiohal/2.0/Android.bp

0 → 100644
+54 −0
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libaudiohal@2.0",



    srcs: [

        "DeviceHalLocal.cpp",

        "DevicesFactoryHalHybrid.cpp",

        "DevicesFactoryHalLocal.cpp",

        "StreamHalLocal.cpp",



        "ConversionHelperHidl.cpp",

        "DeviceHalHidl.cpp",

        "DevicesFactoryHalHidl.cpp",

        "EffectBufferHalHidl.cpp",

        "EffectHalHidl.cpp",

        "EffectsFactoryHalHidl.cpp",

        "StreamHalHidl.cpp",

    ],



    export_include_dirs: ["."],



    cflags: [

        "-Wall",

        "-Werror",

    ],

    shared_libs: [

        "libaudiohal_deathhandler",

        "libaudioutils",

        "libcutils",

        "liblog",

        "libutils",

        "libhardware",

        "libbase",

        "libfmq",

        "libhwbinder",

        "libhidlbase",

        "libhidlmemory",

        "libhidltransport",

        "android.hardware.audio@2.0",

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

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

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

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "libmedia_helper",

        "libmediautils",

    ],

    header_libs: [

        "libaudiohal_headers"

    ],



    export_shared_lib_headers: [

        "libfmq",

    ],

}

media/libaudiohal/DeviceHalHidl.cpp→media/libaudiohal/2.0/DeviceHalHidl.cpp

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ using ::android::hardware::audio::common::V2_0::AudioPort; 
using ::android::hardware::audio::common::V2_0::AudioPortConfig;

using ::android::hardware::audio::common::V2_0::AudioMode;

using ::android::hardware::audio::common::V2_0::AudioSource;

using ::android::hardware::audio::common::V2_0::HidlUtils;

using ::android::hardware::audio::V2_0::DeviceAddress;

using ::android::hardware::audio::V2_0::IPrimaryDevice;

using ::android::hardware::audio::V2_0::ParameterValue;