mediaserver: instantiate SecTVOutService for samsung tvout
Change-Id: I0e7767f8cf3ffd0bc376d14cf4fffffed225e701
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index 5a73cdd..1ff87c8 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -11,6 +11,11 @@
libutils \
libbinder
+ifeq ($(BOARD_USE_SECTVOUT),true)
+ LOCAL_CFLAGS += -DSECTVOUT
+ LOCAL_SHARED_LIBRARIES += libTVOut
+endif
+
# FIXME The duplicate audioflinger is temporary
LOCAL_C_INCLUDES := \
frameworks/av/media/libmediaplayerservice \
diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp
index 6b1abb1..b8fddc4 100644
--- a/media/mediaserver/main_mediaserver.cpp
+++ b/media/mediaserver/main_mediaserver.cpp
@@ -31,11 +31,20 @@
using namespace android;
+#ifdef SECTVOUT
+namespace android { namespace SecTVOutService {
+void instantiate(void);
+} }
+#endif
+
int main(int argc, char** argv)
{
sp<ProcessState> proc(ProcessState::self());
sp<IServiceManager> sm = defaultServiceManager();
ALOGI("ServiceManager: %p", sm.get());
+#ifdef SECTVOUT
+ SecTVOutService::instantiate();
+#endif
AudioFlinger::instantiate();
MediaPlayerService::instantiate();
CameraService::instantiate();