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

Commit 8ec7278d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Provide defaults for android.hardware.audio@6.0-impl" am: 3f5116a1... 

Merge "Provide defaults for android.hardware.audio@6.0-impl" am: 3f5116a1 am: 5912212c am: 3ef99476 am: b4a1b4f9

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1366502

Change-Id: I922e7bbd0806472f4ffe79e23d3f9d0f149be7a9
parents 59ca8e29 b4a1b4f9

audio/core/all-versions/default/Android.bp

+29 −9
Original line number Diff line number Diff line 
cc_defaults {

    name: "android.hardware.audio-impl_default",

    relative_install_path: "hw",

    proprietary: true,

    vendor: true,

filegroup {

    name: "android.hardware.audio-impl_srcs",

    srcs: [

        "Conversions.cpp",

        "Device.cpp",
@@ -13,10 +10,23 @@ cc_defaults { 
        "StreamIn.cpp",

        "StreamOut.cpp",

    ],

}



    defaults: ["hidl_defaults"],



cc_library_headers {

    name: "android.hardware.audio-impl_headers",

    proprietary: true,

    vendor: true,

    export_include_dirs: ["include"],

}



cc_defaults {

    name: "android.hardware.audio-impl_default",

    relative_install_path: "hw",

    proprietary: true,

    vendor: true,

    srcs: [":android.hardware.audio-impl_srcs"],



    defaults: ["hidl_defaults"],



    static_libs: [

        "libaudiofoundation",
@@ -35,12 +45,17 @@ cc_defaults { 
    ],



    header_libs: [

        "android.hardware.audio-impl_headers",

        "android.hardware.audio.common.util@all-versions",

        "libaudioclient_headers",

        "libaudio_system_headers",

        "libhardware_headers",

        "libmedia_headers",

    ],



    export_header_lib_headers: [

        "android.hardware.audio-impl_headers",

    ],

}



cc_library_shared {
@@ -89,8 +104,8 @@ cc_library_shared { 
    ],

}



cc_library_shared {

    name: "android.hardware.audio@6.0-impl",

cc_defaults {

    name: "android.hardware.audio@6.0-impl_default",

    defaults: ["android.hardware.audio-impl_default"],

    shared_libs: [

        "android.hardware.audio@6.0",
@@ -103,3 +118,8 @@ cc_library_shared { 
        "-include common/all-versions/VersionMacro.h",

    ],

}



cc_library_shared {

    name: "android.hardware.audio@6.0-impl",

    defaults: ["android.hardware.audio@6.0-impl_default"],

}