Move IMediaLogService to libmedialogservice
So audioserver and libmedialogservice don't have to link against libmedia
Test: build/boot
Change-Id: I4040d9f6db59807c3fa56321d45fb6ab50fb5edb
diff --git a/media/audioserver/Android.mk b/media/audioserver/Android.mk
index 91cc902..c620e7c 100644
--- a/media/audioserver/Android.mk
+++ b/media/audioserver/Android.mk
@@ -11,7 +11,6 @@
libbinder \
libcutils \
liblog \
- libmedia \
libmedialogservice \
libradioservice \
libsoundtriggerservice \
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index ba31cfa..c9dc351 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -29,7 +29,6 @@
IMediaDrmService.cpp \
IMediaHTTPConnection.cpp \
IMediaHTTPService.cpp \
- IMediaLogService.cpp \
IMediaExtractor.cpp \
IMediaExtractorService.cpp \
IMediaPlayerService.cpp \
diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk
index 1657c08..7f22c91 100644
--- a/services/audioflinger/Android.mk
+++ b/services/audioflinger/Android.mk
@@ -36,6 +36,7 @@
LOCAL_C_INCLUDES := \
$(TOPDIR)frameworks/av/services/audiopolicy \
+ $(TOPDIR)frameworks/av/services/medialog \
$(TOPDIR)external/sonic \
$(call include-path-for, audio-utils)
@@ -49,6 +50,7 @@
liblog \
libbinder \
libmedia \
+ libmedialogservice \
libmediautils \
libnbaio \
libpowermanager \
diff --git a/services/medialog/Android.mk b/services/medialog/Android.mk
index 88f98cf..a1da63d 100644
--- a/services/medialog/Android.mk
+++ b/services/medialog/Android.mk
@@ -2,9 +2,9 @@
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)
diff --git a/media/libmedia/IMediaLogService.cpp b/services/medialog/IMediaLogService.cpp
similarity index 100%
rename from media/libmedia/IMediaLogService.cpp
rename to services/medialog/IMediaLogService.cpp