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

Commit fd94a896 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audiopolicy: Convert some of .mk files to .bp files"

parents a710ea16 13ce4f67

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libmediacodecservice.so) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libstagefright_xmlparser@1.0.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libstagefright_soft_*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk/libstagefright_soft_*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libaudiopolicyengineconfig*)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

services/audiopolicy/engine/common/Android.bp

+28 −0
Original line number Diff line number Diff line
@@ -17,3 +17,31 @@ cc_library_headers { 
    host_supported: true,

    export_include_dirs: ["include"],

}



cc_library_static {

    name: "libaudiopolicyengine_common",

    srcs: [

        "src/EngineBase.cpp",

        "src/ProductStrategy.cpp",

        "src/VolumeCurve.cpp",

        "src/VolumeGroup.cpp",

    ],

    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

    ],

    header_libs: [

        "libbase_headers",

        "libaudiopolicycommon",

        "libaudiopolicyengine_common_headers",

        "libaudiopolicyengine_interface_headers",

    ],

    export_header_lib_headers: [

        "libaudiopolicyengine_common_headers",

    ],

    static_libs: [

        "libaudiopolicycomponents",

        "libaudiopolicyengine_config",

    ],

}

services/audiopolicy/engine/config/Android.bp

0 → 100644
+31 −0
Original line number Diff line number Diff line 
cc_library_static {

    name: "libaudiopolicyengine_config",

    export_include_dirs: ["include"],

    include_dirs: [

        "external/libxml2/include",

        "external/icu/icu4c/source/common",

    ],

    srcs: [

        "src/EngineConfig.cpp",

    ],

    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

    ],

    shared_libs: [

        "libmedia_helper",

        "libandroidicu",

        "libxml2",

        "libutils",

        "liblog",

        "libcutils",

    ],

    static_libs: [

        "libaudiopolicycomponents",

    ],

    header_libs: [

        "libaudio_system_headers",

        "libaudiopolicycommon",

    ],

}

services/audiopolicy/engine/config/Android.mk

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)



##################################################################

# Component build

##################################################################



include $(CLEAR_VARS)



LOCAL_EXPORT_C_INCLUDE_DIRS :=  $(LOCAL_PATH)/include



LOCAL_C_INCLUDES := \

    $(LOCAL_EXPORT_C_INCLUDE_DIRS) \

    external/libxml2/include \

    external/icu/icu4c/source/common



LOCAL_SRC_FILES := \

    src/EngineConfig.cpp



LOCAL_CFLAGS += -Wall -Werror -Wextra



LOCAL_SHARED_LIBRARIES := \

    libmedia_helper \

    libandroidicu \

    libxml2 \

    libutils \

    liblog \

    libcutils



LOCAL_STATIC_LIBRARIES := \

    libaudiopolicycomponents



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)



LOCAL_MODULE := libaudiopolicyengineconfig

LOCAL_MODULE_TAGS := optional



LOCAL_HEADER_LIBRARIES := \

    libaudio_system_headers \

    libaudiopolicycommon



include $(BUILD_SHARED_LIBRARY)

services/audiopolicy/engineconfigurable/Android.mk

+4 −7
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ LOCAL_SRC_FILES := \ 
    src/EngineInstance.cpp \

    src/Stream.cpp \

    src/InputSource.cpp \

    ../engine/common/src/VolumeCurve.cpp \

    ../engine/common/src/VolumeGroup.cpp \

    ../engine/common/src/ProductStrategy.cpp \

    ../engine/common/src/EngineBase.cpp



audio_policy_engine_includes_common := \

    frameworks/av/services/audiopolicy/engineconfigurable/include \
@@ -37,7 +33,6 @@ LOCAL_C_INCLUDES := \ 


LOCAL_HEADER_LIBRARIES := \

    libaudiopolicycommon \

    libaudiopolicyengine_common_headers \

    libaudiopolicyengine_interface_headers



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)
@@ -47,13 +42,15 @@ LOCAL_MODULE_TAGS := optional 


LOCAL_STATIC_LIBRARIES := \

    libaudiopolicypfwwrapper \

    libaudiopolicycomponents

    libaudiopolicycomponents \

    libaudiopolicyengine_common \

    libaudiopolicyengine_config \



LOCAL_SHARED_LIBRARIES := \

    libaudiopolicyengineconfig \

    liblog \

    libutils \

    liblog \

    libcutils \

    libaudioutils \

    libparameter \

    libmedia_helper \