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

Commit a8814e51 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Jakub Pawlowski
Browse files

Audio: Build file updates 

Add target for the library with code generated by xsdc.

Temporarily disable default implementation and VTS targets.

Bug: 142480271
Test: m
Change-Id: I6c891893398617a36f4748f185e189064ba4d4ee
Merged-In: I6c891893398617a36f4748f185e189064ba4d4ee
parent 60ced768

audio/common/7.0/Android.bp

+13 −0
Original line number Diff line number Diff line
@@ -12,3 +12,16 @@ hidl_interface { 
    gen_java: true,

    gen_java_constants: true,

}



cc_library {

    name: "android.hardware.audio.common@7.0-enums",

    vendor_available: true,

    generated_sources: ["audio_policy_configuration_V7_0"],

    generated_headers: ["audio_policy_configuration_V7_0"],

    header_libs: ["libxsdc-utils"],

    shared_libs: [

        "libbase",

        "liblog",

        "libxml2",

    ],

}

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

+8 −7
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ cc_library_shared { 
    ],

    export_header_lib_headers: [

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

    ]

    ],

}



cc_defaults {
@@ -57,7 +57,7 @@ cc_defaults { 
        "android.hardware.audio.common-util",

    ],

    export_shared_lib_headers: [

        "android.hardware.audio.common-util"

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

    ],



    header_libs: [
@@ -76,7 +76,7 @@ cc_library_shared { 
        "-DMAJOR_VERSION=2",

        "-DMINOR_VERSION=0",

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

    ]

    ],

}



cc_library_shared {
@@ -89,7 +89,7 @@ cc_library_shared { 
        "-DMAJOR_VERSION=4",

        "-DMINOR_VERSION=0",

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

    ]

    ],

}



cc_library_shared {
@@ -102,7 +102,7 @@ cc_library_shared { 
        "-DMAJOR_VERSION=5",

        "-DMINOR_VERSION=0",

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

    ]

    ],

}



cc_library_shared {
@@ -115,10 +115,11 @@ cc_library_shared { 
        "-DMAJOR_VERSION=6",

        "-DMINOR_VERSION=0",

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

    ]

    ],

}



cc_library_shared {

    enabled: false,

    name: "android.hardware.audio.common@7.0-util",

    defaults: ["android.hardware.audio.common-util_default"],

    shared_libs: [
@@ -128,5 +129,5 @@ cc_library_shared { 
        "-DMAJOR_VERSION=7",

        "-DMINOR_VERSION=0",

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

    ]

    ],

}

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

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ cc_library_shared { 
}



cc_library_shared {

    enabled: false,

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

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

    shared_libs: [

audio/core/all-versions/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ cc_test { 
}



cc_test {

    enabled: false,

    name: "VtsHalAudioV7_0TargetTest",

    defaults: ["VtsHalAudioTargetTest_defaults"],

    srcs: [

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

+6 −5
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ cc_library_shared { 
        "-DMAJOR_VERSION=2",

        "-DMINOR_VERSION=0",

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

    ]

    ],

}



cc_library_shared {
@@ -71,7 +71,7 @@ cc_library_shared { 
        "-DMAJOR_VERSION=4",

        "-DMINOR_VERSION=0",

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

    ]

    ],

}



cc_library_shared {
@@ -86,7 +86,7 @@ cc_library_shared { 
        "-DMAJOR_VERSION=5",

        "-DMINOR_VERSION=0",

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

    ]

    ],

}



cc_library_shared {
@@ -101,10 +101,11 @@ cc_library_shared { 
        "-DMAJOR_VERSION=6",

        "-DMINOR_VERSION=0",

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

    ]

    ],

}



cc_library_shared {

    enabled: false,

    name: "android.hardware.audio.effect@7.0-impl",

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

    shared_libs: [
@@ -116,5 +117,5 @@ cc_library_shared { 
        "-DMAJOR_VERSION=7",

        "-DMINOR_VERSION=0",

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

    ]

    ],

}