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

Commit 1108d4a9 authored by Kevin Rocard's avatar Kevin Rocard
Browse files

Audio HAL: Factorize Android.bp 



Lots of Android.bp content was duplicated per version.

Bug: 118203066
Test: compile
Change-Id: I4072314f1e1278c6d876fc681ba20363728f151b
Signed-off-by: default avatarKevin Rocard <krocard@google.com>
parent d10247b7

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

+13 −28
Original line number Diff line number Diff line
@@ -39,9 +39,10 @@ cc_library_shared { 
    ]

}



cc_library_shared {

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

cc_defaults {

    name: "android.hardware.audio.common-util_default",

    defaults: ["hidl_defaults"],



    vendor_available: true,

    srcs: [

        "HidlUtils.cpp",
@@ -49,15 +50,11 @@ cc_library_shared { 


    export_include_dirs: ["."],



    static_libs: [

    ],



    shared_libs: [

        "liblog",

        "libutils",

        "libhidlbase",

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

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

    ],

    export_shared_lib_headers: [

        "android.hardware.audio.common-util"
@@ -67,6 +64,15 @@ cc_library_shared { 
        "libaudio_system_headers",

        "libhardware_headers",

    ],

}



cc_library_shared {

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

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



    shared_libs: [

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

    ],

    cflags: [

        "-DMAJOR_VERSION=2",

        "-DMINOR_VERSION=0",
@@ -76,32 +82,11 @@ cc_library_shared { 


cc_library_shared {

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

    defaults: ["hidl_defaults"],

    vendor_available: true,

    srcs: [

        "HidlUtils.cpp",

    ],



    export_include_dirs: ["."],



    static_libs: [

    ],

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



    shared_libs: [

        "liblog",

        "libutils",

        "libhidlbase",

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

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

    ],

    export_shared_lib_headers: [

        "android.hardware.audio.common-util"

    ],



    header_libs: [

        "libaudio_system_headers",

        "libhardware_headers",

    ],

    cflags: [

        "-DMAJOR_VERSION=4",

        "-DMINOR_VERSION=0",

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

+14 −43
Original line number Diff line number Diff line 
cc_library_shared {

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

cc_defaults {

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

    relative_install_path: "hw",

    proprietary: true,

    vendor: true,
@@ -27,9 +27,6 @@ cc_library_shared { 
        "libhidltransport",

        "liblog",

        "libutils",

        "android.hardware.audio@2.0",

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

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

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

    ],
@@ -44,6 +41,17 @@ cc_library_shared { 
    whole_static_libs: [

        "libmedia_helper",

    ],

}



cc_library_shared {

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

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



    shared_libs: [

        "android.hardware.audio@2.0",

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

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

    ],



    cflags: [

        "-DMAJOR_VERSION=2",
@@ -54,49 +62,12 @@ cc_library_shared { 


cc_library_shared {

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

    relative_install_path: "hw",

    proprietary: true,

    vendor: true,

    srcs: [

        "Conversions.cpp",

        "Device.cpp",

        "DevicesFactory.cpp",

        "ParametersUtil.cpp",

        "PrimaryDevice.cpp",

        "Stream.cpp",

        "StreamIn.cpp",

        "StreamOut.cpp",

    ],



    defaults: ["hidl_defaults"],



    export_include_dirs: ["include"],

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



    shared_libs: [

        "libbase",

        "libcutils",

        "libfmq",

        "libhardware",

        "libhidlbase",

        "libhidltransport",

        "liblog",

        "libutils",

        "android.hardware.audio@4.0",

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

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

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

    ],



    header_libs: [

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

        "libaudioclient_headers",

        "libaudio_system_headers",

        "libhardware_headers",

        "libmedia_headers",

    ],



    whole_static_libs: [

        "libmedia_helper",

    ],



    cflags: [

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

+15 −18
Original line number Diff line number Diff line
@@ -14,17 +14,14 @@ 
// limitations under the License.

//



cc_test {

    name: "VtsHalAudioV2_0TargetTest",

cc_defaults {

    name: "VtsHalAudioTargetTest_defaults",

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: [

        "2.0/AudioPrimaryHidlHalTest.cpp",

        "ValidateAudioConfiguration.cpp"

    ],

    static_libs: [

        "android.hardware.audio.common.test.utility",

        "android.hardware.audio@2.0",

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

        "libicuuc",

        "libicuuc_stubdata",

        "libxml2",
@@ -36,6 +33,18 @@ cc_test { 
        "android.hardware.audio.common.util@all-versions",

    ],

    test_suites: ["general-tests"],

}



cc_test {

    name: "VtsHalAudioV2_0TargetTest",

    defaults: ["VtsHalAudioTargetTest_defaults"],

    srcs: [

        "2.0/AudioPrimaryHidlHalTest.cpp",

    ],

    static_libs: [

        "android.hardware.audio@2.0",

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

    ],

    cflags: [

        "-DMAJOR_VERSION=2",

        "-DMINOR_VERSION=0",
@@ -45,26 +54,14 @@ cc_test { 


cc_test {

    name: "VtsHalAudioV4_0TargetTest",

    defaults: ["VtsHalTargetTestDefaults"],

    defaults: ["VtsHalAudioTargetTest_defaults"],

    srcs: [

        "4.0/AudioPrimaryHidlHalTest.cpp",

        "ValidateAudioConfiguration.cpp"

    ],

    static_libs: [

        "android.hardware.audio.common.test.utility",

        "android.hardware.audio@4.0",

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

        "libicuuc",

        "libicuuc_stubdata",

        "libxml2",

    ],

    shared_libs: [

        "libfmq",

    ],

    header_libs: [

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

    ],

    test_suites: ["general-tests"],

    cflags: [

        "-DMAJOR_VERSION=4",

        "-DMINOR_VERSION=0",

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

+14 −45
Original line number Diff line number Diff line 
cc_library_shared {

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

cc_defaults {

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

    defaults: ["hidl_defaults"],

    vendor: true,

    relative_install_path: "hw",
@@ -32,9 +32,6 @@ cc_library_shared { 
        "liblog",

        "libutils",

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

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

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

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

        "android.hidl.memory@1.0",

    ],
@@ -46,6 +43,17 @@ cc_library_shared { 
        "libhardware_headers",

        "libmedia_headers",

    ],

}



cc_library_shared {

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

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

    shared_libs: [

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

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

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

    ],



    cflags: [

        "-DMAJOR_VERSION=2",

        "-DMINOR_VERSION=0",
@@ -55,52 +63,13 @@ cc_library_shared { 


cc_library_shared {

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

    defaults: ["hidl_defaults"],

    vendor: true,

    relative_install_path: "hw",

    srcs: [

        "AcousticEchoCancelerEffect.cpp",

        "AudioBufferManager.cpp",

        "AutomaticGainControlEffect.cpp",

        "BassBoostEffect.cpp",

        "Conversions.cpp",

        "DownmixEffect.cpp",

        "Effect.cpp",

        "EffectsFactory.cpp",

        "EnvironmentalReverbEffect.cpp",

        "EqualizerEffect.cpp",

        "LoudnessEnhancerEffect.cpp",

        "NoiseSuppressionEffect.cpp",

        "PresetReverbEffect.cpp",

        "VirtualizerEffect.cpp",

        "VisualizerEffect.cpp",

    ],



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

    shared_libs: [

        "libbase",

        "libcutils",

        "libeffects",

        "libfmq",

        "libhidlbase",

        "libhidlmemory",

        "libhidltransport",

        "liblog",

        "libutils",

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

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

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

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

        "android.hidl.memory@1.0",

    ],



    header_libs: [

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

        "libaudio_system_headers",

        "libaudioclient_headers",

        "libeffects_headers",

        "libhardware_headers",

        "libmedia_headers",

    ],

    cflags: [

        "-DMAJOR_VERSION=4",

        "-DMINOR_VERSION=0",

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

+12 −20
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
// limitations under the License.

//



cc_test {

    name: "VtsHalAudioEffectV2_0TargetTest",

cc_defaults {

    name: "VtsHalAudioEffectTargetTest_default",

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: [

        "VtsHalAudioEffectTargetTest.cpp",
@@ -23,8 +23,6 @@ cc_test { 
    ],

    static_libs: [

        "android.hardware.audio.common.test.utility",

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

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

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "libeffectsconfig",
@@ -36,6 +34,15 @@ cc_test { 
        "android.hardware.audio.common.util@all-versions",

    ],

    test_suites: ["general-tests"],

}



cc_test {

    name: "VtsHalAudioEffectV2_0TargetTest",

    defaults: ["VtsHalAudioEffectTargetTest_default"],

    static_libs: [

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

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

    ],

    cflags: [

        "-DMAJOR_VERSION=2",

        "-DMINOR_VERSION=0",
@@ -45,26 +52,11 @@ cc_test { 


cc_test {

    name: "VtsHalAudioEffectV4_0TargetTest",

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: [

        "VtsHalAudioEffectTargetTest.cpp",

        "ValidateAudioEffectsConfiguration.cpp"

    ],

    defaults: ["VtsHalAudioEffectTargetTest_default"],

    static_libs: [

        "android.hardware.audio.common.test.utility",

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

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

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "libeffectsconfig",

        "libicuuc",

        "libicuuc_stubdata",

        "libxml2",

    ],

    header_libs: [

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

    ],

    test_suites: ["general-tests"],

    cflags: [

        "-DMAJOR_VERSION=4",

        "-DMINOR_VERSION=0",