mediaserver: instantiate SecTVOutService for samsung tvout
Change-Id: I0e7767f8cf3ffd0bc376d14cf4fffffed225e701
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk
index 1ac647a..5f84723 100644
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -28,6 +28,11 @@
LOCAL_STATIC_LIBRARIES := \
libregistermsext
+ifeq ($(BOARD_USE_SECTVOUT),true)
+ LOCAL_CFLAGS += -DSECTVOUT
+ LOCAL_SHARED_LIBRARIES += libTVOut
+endif
+
LOCAL_C_INCLUDES := \
frameworks/av/media/libmediaplayerservice \
frameworks/av/services/medialog \
diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp
index d5207d5..efe6e85 100644
--- a/media/mediaserver/main_mediaserver.cpp
+++ b/media/mediaserver/main_mediaserver.cpp
@@ -37,6 +37,12 @@
using namespace android;
+#ifdef SECTVOUT
+namespace android { namespace SecTVOutService {
+void instantiate(void);
+} }
+#endif
+
int main(int argc, char** argv)
{
signal(SIGPIPE, SIG_IGN);
@@ -124,6 +130,9 @@
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();