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

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

Merge "Use libxml2 as shared lib."

parents a73f0b1d e4c3c431

services/audiopolicy/Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -79,9 +79,7 @@ LOCAL_STATIC_LIBRARIES := \ 
LOCAL_SHARED_LIBRARIES += libmedia_helper



ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

LOCAL_STATIC_LIBRARIES += libxml2



LOCAL_SHARED_LIBRARIES += libicuuc

LOCAL_SHARED_LIBRARIES += libicuuc libxml2



LOCAL_CFLAGS += -DUSE_XML_AUDIO_POLICY_CONF

endif #ifeq ($(USE_XML_AUDIO_POLICY_CONF), 1)

services/audiopolicy/common/managerdefinitions/Android.mk

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


LOCAL_SRC_FILES += src/Serializer.cpp



LOCAL_STATIC_LIBRARIES += libxml2



LOCAL_SHARED_LIBRARIES += libicuuc

LOCAL_SHARED_LIBRARIES += libicuuc libxml2



LOCAL_C_INCLUDES += \

    $(TOPDIR)external/libxml2/include \

services/audiopolicy/engineconfigurable/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ LOCAL_MODULE_TAGS := optional 


LOCAL_STATIC_LIBRARIES := \

    libaudiopolicypfwwrapper \

    libaudiopolicycomponents \

    libxml2

    libaudiopolicycomponents



LOCAL_SHARED_LIBRARIES := \

    liblog \
@@ -52,7 +51,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    liblog \

    libaudioutils \

    libparameter \

    libmedia_helper

    libmedia_helper \

    libxml2



include $(BUILD_SHARED_LIBRARY)

services/audiopolicy/enginedefault/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ LOCAL_MODULE_TAGS := optional 


LOCAL_STATIC_LIBRARIES := \

    libaudiopolicycomponents \

    libxml2



LOCAL_SHARED_LIBRARIES += \

    liblog \