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

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

Merge "audiopolicy: More XML deserializer refactorings"

parents 1212e0ad 43c386c8

services/audiopolicy/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ LOCAL_SHARED_LIBRARIES += libmedia_helper 
LOCAL_SHARED_LIBRARIES += libmediametrics

LOCAL_SHARED_LIBRARIES += libmediametrics





ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

LOCAL_SHARED_LIBRARIES += libicuuc libxml2

LOCAL_SHARED_LIBRARIES += libhidlbase libicuuc libxml2





LOCAL_CFLAGS += -DUSE_XML_AUDIO_POLICY_CONF

LOCAL_CFLAGS += -DUSE_XML_AUDIO_POLICY_CONF

endif #ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

endif #ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

services/audiopolicy/common/managerdefinitions/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1) 




LOCAL_SRC_FILES += src/Serializer.cpp

LOCAL_SRC_FILES += src/Serializer.cpp





LOCAL_SHARED_LIBRARIES += libicuuc libxml2

LOCAL_SHARED_LIBRARIES += libhidlbase libicuuc libxml2





LOCAL_C_INCLUDES += \

LOCAL_C_INCLUDES += \

    external/libxml2/include \

    external/libxml2/include \

services/audiopolicy/common/managerdefinitions/src/Serializer.cpp

+143 −158

File changed.

Preview size limit exceeded, changes collapsed.