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

Commit d3a85ce7 authored by Andy Hung's avatar Andy Hung Committed by Gerrit Code Review
Browse files

Merge "AudioPolicy: Makefile - clean up lib dependencies" into main

parents 2626db4b 7b188ed9

media/libaudioclient/aidl/fuzzer/Android.bp

+1 −25
Original line number Diff line number Diff line
@@ -27,53 +27,28 @@ cc_defaults { 
        "libcgrouprc_format",

        "libfakeservicemanager",

        "libjsoncpp",

        "liblog",

        "libmedia_helper",

        "libmediametricsservice",

        "libprocessgroup",

        "shared-file-region-aidl-cpp",

    ],

    shared_libs: [

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

        "audioclient-types-aidl-cpp",

        "audioflinger-aidl-cpp",

        "audiopolicy-aidl-cpp",

        "audiopolicy-types-aidl-cpp",

        "av-types-aidl-cpp",

        "capture_state_listener-aidl-cpp",

        "effect-aidl-cpp",

        "framework-permission-aidl-cpp",

        "libactivitymanager_aidl",

        "libaudioclient",

        "libaudioclient_aidl_conversion",

        "libaudioflinger",

        "libaudiofoundation",

        "libaudiohal",

        "libaudiomanager",

        "libaudiopolicy",

        "libaudiopolicymanagerdefault",

        "libaudiopolicyservice",

        "libaudioprocessing",

        "libaudioutils",

        "libdl",

        "libheadtracking",

        "libmediametrics",

        "libmediautils",

        "libnbaio",

        "libnblog",

        "libpowermanager",

        "libvibrator",

        "libvndksupport",

        "libxml2",

        "mediametricsservice-aidl-cpp",

        "packagemanager_aidl-cpp",

    ],

    header_libs: [

        "libaudioflinger_headers",

        "libaudiofoundation_headers",

        "libaudiohal_headers",

        "libaudiopolicymanager_interface_headers",

        "libbinder_headers",

        "libmedia_headers",

    ],

    fuzz_config: {
@@ -98,6 +73,7 @@ cc_fuzz { 
        "latest_android_hardware_audio_core_sounddose_ndk_shared",

        "latest_android_hardware_audio_effect_ndk_shared",

        "libaudioclient_aidl_fuzzer_defaults",

        "libaudiopolicyservice_dependencies",

        "service_fuzzer_defaults",

    ],

}

media/libaudiohal/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ cc_library_shared { 
        "liberror_headers",

        "libmediautils_headers",

    ],



    export_include_dirs: ["include"],

}



cc_library_shared {

services/audioflinger/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -141,6 +141,10 @@ cc_defaults { 
cc_defaults {

    name: "libaudioflinger_dependencies",



    header_libs: [

        "libaudiohal_headers", // required for AudioFlinger

    ],



    shared_libs: [

        "audioclient-types-aidl-cpp",

        "audioflinger-aidl-cpp",
@@ -225,6 +229,8 @@ cc_library { 
        "libmedia_headers",

    ],



    export_include_dirs: ["."],



    export_shared_lib_headers: [

        "libpermission",

    ],

services/audiopolicy/fuzzer/Android.bp

+6 −27
Original line number Diff line number Diff line
@@ -28,39 +28,18 @@ package { 


cc_fuzz {

    name: "audiopolicy_fuzzer",

    defaults: [

        "libaudiopolicyservice_dependencies",

    ],

    srcs: [

        "audiopolicy_fuzzer.cpp",

    ],

    include_dirs: [

        "frameworks/av/services/audiopolicy",

    ],

    shared_libs: [

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

        "capture_state_listener-aidl-cpp",

        "framework-permission-aidl-cpp",

        "libaudioclient",

        "libaudiofoundation",

        "libaudiopolicy",

        "libaudiopolicycomponents",

        "libaudiopolicymanagerdefault",

        "libbase",

        "libbinder",

        "libcutils",

        "libdl",

        "libhidlbase",

        "liblog",

        "libmedia_helper",

        "libmediametrics",

        "libutils",

        "libxml2",

    ],

    static_libs: [

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

    ],

    header_libs: [

        "libaudiopolicycommon",

        "libaudiopolicyengine_interface_headers",

        "libaudiopolicymanager_interface_headers",

    include_dirs: [

        "frameworks/av/services/audiopolicy", // include path outside of libaudiopolicyservice

        "frameworks/av/services/audiopolicy/engine/interface", // for /tests/AudioPolicyTestManager.h:

    ],

    data: [":audiopolicyfuzzer_configuration_files"],

    fuzz_config: {

services/audiopolicy/fuzzer/aidl/Android.bp

+2 −15
Original line number Diff line number Diff line
@@ -23,20 +23,11 @@ package { 
cc_defaults {

    name: "audiopolicy_aidl_fuzzer_defaults",

    shared_libs: [

        "audiopolicy-aidl-cpp",

        "audiopolicy-types-aidl-cpp",

        "framework-permission-aidl-cpp",

        "libactivitymanager_aidl",

        "libaudioclient",

        "libaudioflinger",

        "libaudiohal",

        "libaudiopolicy",

        "libaudiopolicymanagerdefault",

        "libaudiopolicyservice",

        "libaudioprocessing",

        "libhidlbase",

        "liblog",

        "libmediautils",

        "libmediaplayerservice",

        "libnbaio",

        "libnblog",

        "libpowermanager",
@@ -46,13 +37,8 @@ cc_defaults { 
    static_libs: [

        "libaudiomockhal",

        "libfakeservicemanager",

        "libmediaplayerservice",

    ],

    header_libs: [

        "libaudioflinger_headers",

        "libaudiohal_headers",

        "libaudiopolicymanager_interface_headers",

        "libbinder_headers",

        "libmedia_headers",

    ],

    fuzz_config: {
@@ -77,6 +63,7 @@ cc_fuzz { 
        "latest_android_hardware_audio_core_ndk_shared",

        "latest_android_hardware_audio_core_sounddose_ndk_shared",

        "latest_android_hardware_audio_effect_ndk_shared",

        "libaudiopolicyservice_dependencies",

        "service_fuzzer_defaults",

    ],

}