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

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

Merge "audioserver: Makefile - remove unused entries" into main

parents d3a85ce7 e5ca886d

media/audioserver/Android.bp

+1 −36
Original line number Diff line number Diff line
@@ -20,12 +20,6 @@ cc_binary { 
        "-Werror",

    ],



    header_libs: [

        "libaudiohal_headers",

        "libmedia_headers",

        "libmediametrics_headers",

    ],



    defaults: [

        "latest_android_hardware_audio_core_sounddose_ndk_shared",

        "latest_android_media_audio_common_types_cpp_shared",
@@ -39,39 +33,10 @@ cc_binary { 
        "libaudioflinger",

        "libaudiopolicyservice",

        "libmedialogservice",

        "libnbaio",

    ],



    shared_libs: [

        "libaudioclient",

        "libaudioprocessing",

        "libbinder",

        "libcutils",

        "libhidlbase",

        "liblog",

        "libmedia",

        "libmediautils",

        "libnblog",

        "libpowermanager",

        "libutils",

        "libvibrator",

    ],



    // TODO check if we still need all of these include directories

    include_dirs: [

        "external/sonic",

        "frameworks/av/media/libaaudio/include",

        "frameworks/av/media/libaaudio/src",

        "frameworks/av/media/libaaudio/src/binding",

        "frameworks/av/services/audioflinger",

        "frameworks/av/services/audiopolicy",

        "frameworks/av/services/audiopolicy/common/include",

        "frameworks/av/services/audiopolicy/common/managerdefinitions/include",

        "frameworks/av/services/audiopolicy/engine/interface",

        "frameworks/av/services/audiopolicy/service",

        "frameworks/av/services/medialog",

        "frameworks/av/services/oboeservice", // TODO oboeservice is the old folder name for aaudioservice. It will be changed.



        "libhidlbase", // required for threadpool config.

    ],



    init_rc: ["audioserver.rc"],

services/audioflinger/Android.bp

+2 −9
Original line number Diff line number Diff line
@@ -181,11 +181,6 @@ cc_defaults { 
        "libvibrator",

        "packagemanager_aidl-cpp",

    ],



    static_libs: [

        "libaudiospdif",

        "libmedialogservice",

    ],

}



cc_library {
@@ -217,15 +212,13 @@ cc_library { 
    ],



    static_libs: [

        "libaudiospdif",

        "libcpustats",

        "libpermission",

        "libmedialogservice",

    ],



    header_libs: [

        "libaaudio_headers",

        "libaudioclient_headers",

        "libaudiohal_headers",

        "libaudioutils_headers",

        "libmedia_headers",

    ],