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

Commit ba6f8217 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Move IMediaLogService to libmedialogservice" am: 12dc4449 

am: ad43cf3a

Change-Id: Ic10b9ad71d89aecac2eda9da21ebe6da9118e897
parents e0016b99 ad43cf3a

media/audioserver/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ LOCAL_SHARED_LIBRARIES := \ 
	libbinder \

	libcutils \

	liblog \

	libmedia \

	libmedialogservice \

	libradioservice \

	libsoundtriggerservice \

media/libmedia/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ LOCAL_SRC_FILES:= \ 
    IMediaDrmService.cpp \

    IMediaHTTPConnection.cpp \

    IMediaHTTPService.cpp \

    IMediaLogService.cpp \

    IMediaExtractor.cpp           \

    IMediaExtractorService.cpp \

    IMediaPlayerService.cpp \

services/audioflinger/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_C_INCLUDES := \

    $(TOPDIR)frameworks/av/services/audiopolicy \

    $(TOPDIR)frameworks/av/services/medialog \

    $(TOPDIR)external/sonic \

    $(call include-path-for, audio-effects) \

    $(call include-path-for, audio-utils)
@@ -48,6 +49,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    liblog \

    libbinder \

    libmedia \

    libmedialogservice \

    libmediautils \

    libnbaio \

    libhardware \

services/medialog/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ LOCAL_PATH := $(call my-dir) 


include $(CLEAR_VARS)



LOCAL_SRC_FILES := MediaLogService.cpp

LOCAL_SRC_FILES := MediaLogService.cpp IMediaLogService.cpp



LOCAL_SHARED_LIBRARIES := libmedia libbinder libutils liblog libnbaio

LOCAL_SHARED_LIBRARIES := libbinder libutils liblog libnbaio



LOCAL_MULTILIB := $(AUDIOSERVER_MULTILIB)