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

Commit 1268b28c authored by Kevin Rocard's avatar Kevin Rocard Committed by Android (Google) Code Review
Browse files

Merge "Policy config parser: migrate to BP and drop legacy format"

parents d4601202 dfa1e8ab
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_SHARED_LIBRARIES += libmedia_helper
LOCAL_SHARED_LIBRARIES += libmediametrics

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)
LOCAL_SHARED_LIBRARIES += libhidlbase libicuuc libxml2

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)
LOCAL_CFLAGS += -DUSE_XML_AUDIO_POLICY_CONF
endif #ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

+4 −0
Original line number Diff line number Diff line
cc_library_headers {
    name: "libaudiopolicycommon",
    export_include_dirs: ["include"],
}
+0 −9
Original line number Diff line number Diff line

LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

#######################################################################
# Recursive call sub-folder Android.mk
#
include $(call all-makefiles-under,$(LOCAL_PATH))
+53 −0
Original line number Diff line number Diff line
cc_library_static {
    name: "libaudiopolicycomponents",

    srcs: [
        "src/AudioCollections.cpp",
        "src/AudioGain.cpp",
        "src/AudioInputDescriptor.cpp",
        "src/AudioOutputDescriptor.cpp",
        "src/AudioPatch.cpp",
        "src/AudioPolicyMix.cpp",
        "src/AudioPort.cpp",
        "src/AudioProfile.cpp",
        "src/AudioRoute.cpp",
        "src/ClientDescriptor.cpp",
        "src/DeviceDescriptor.cpp",
        "src/EffectDescriptor.cpp",
        "src/HwModule.cpp",
        "src/IOProfile.cpp",
        "src/Serializer.cpp",
        "src/SoundTriggerSession.cpp",
        "src/TypeConverter.cpp",
        "src/VolumeCurve.cpp",
    ],
    shared_libs: [
        "libcutils",
        "libhidlbase",
        "libicuuc",
        "liblog",
        "libmedia",
        "libutils",
        "libxml2",
    ],
    export_shared_lib_headers: ["libmedia"],
    static_libs: [
        "libaudioutils",
    ],
    header_libs: [
        "libaudiopolicycommon",
    ],
    export_header_lib_headers: ["libaudiopolicycommon"],

    include_dirs: [
        "frameworks/av/services/audiopolicy",
    ],

    export_include_dirs: ["include"],

    cflags: [
        "-Wall",
        "-Werror",
    ],

}
+0 −66
Original line number Diff line number Diff line
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_SRC_FILES:= \
    src/DeviceDescriptor.cpp \
    src/AudioGain.cpp \
    src/HwModule.cpp \
    src/IOProfile.cpp \
    src/AudioPort.cpp \
    src/AudioProfile.cpp \
    src/AudioRoute.cpp \
    src/AudioPolicyMix.cpp \
    src/AudioPatch.cpp \
    src/AudioInputDescriptor.cpp \
    src/AudioOutputDescriptor.cpp \
    src/AudioCollections.cpp \
    src/EffectDescriptor.cpp \
    src/SoundTriggerSession.cpp \
    src/VolumeCurve.cpp \
    src/TypeConverter.cpp \
    src/ClientDescriptor.cpp

LOCAL_SHARED_LIBRARIES := \
    libcutils \
    libmedia \
    libutils \
    liblog \

LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libmedia

LOCAL_C_INCLUDES := \
    $(LOCAL_PATH)/include \
    frameworks/av/services/audiopolicy/common/include \
    frameworks/av/services/audiopolicy \
    $(call include-path-for, audio-utils) \

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

LOCAL_SRC_FILES += src/Serializer.cpp

LOCAL_SHARED_LIBRARIES += libhidlbase libicuuc libxml2

LOCAL_C_INCLUDES += \
    external/libxml2/include \
    external/icu/icu4c/source/common

else

LOCAL_SRC_FILES += \
    src/ConfigParsingUtils.cpp \
    src/StreamDescriptor.cpp \
    src/Gains.cpp

endif #ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

LOCAL_EXPORT_C_INCLUDE_DIRS := \
    $(LOCAL_PATH)/include

LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)

LOCAL_CFLAGS := -Wall -Werror

LOCAL_MODULE := libaudiopolicycomponents

include $(BUILD_STATIC_LIBRARY)
Loading