summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorcodeworkx <daniel.hillenbrand@codeworkx.de>2011-12-30 15:59:44 +0100
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2012-11-19 23:14:19 +0000
commitc8ae471e2b184e2e3360dc1d8532e777090bfb89 (patch)
tree2d6b73c3698e164c917b5a005ef6cb1ab40b49e0 /cmds
parentd9c36b06c6730c80d2243852402656c622db87eb (diff)
downloadframeworks_base-c8ae471e2b184e2e3360dc1d8532e777090bfb89.zip
frameworks_base-c8ae471e2b184e2e3360dc1d8532e777090bfb89.tar.gz
frameworks_base-c8ae471e2b184e2e3360dc1d8532e777090bfb89.tar.bz2
samsung: add support for tvout and yamahaplayer services
Change-Id: I653f9876b7fb83734abf3a0b9b9b5af1920b8112
Diffstat (limited to 'cmds')
-rw-r--r--cmds/servicemanager/Android.mk6
-rw-r--r--cmds/servicemanager/service_manager.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/cmds/servicemanager/Android.mk b/cmds/servicemanager/Android.mk
index 8840867..07860e5 100644
--- a/cmds/servicemanager/Android.mk
+++ b/cmds/servicemanager/Android.mk
@@ -9,4 +9,10 @@ include $(CLEAR_VARS)
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_SRC_FILES := service_manager.c binder.c
LOCAL_MODULE := servicemanager
+ifeq ($(BOARD_USE_YAMAHAPLAYER),true)
+ LOCAL_CFLAGS += -DYAMAHAPLAYER
+endif
+ifeq ($(BOARD_USE_SECTVOUT),true)
+ LOCAL_CFLAGS += -DSECTVOUT
+endif
include $(BUILD_EXECUTABLE)
diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c
index 6d8402b..63823a3 100644
--- a/cmds/servicemanager/service_manager.c
+++ b/cmds/servicemanager/service_manager.c
@@ -32,6 +32,12 @@ static struct {
{ AID_MEDIA, "media.camera" },
{ AID_MEDIA, "media.audio_policy" },
{ AID_MEDIA, "media.nvidia.audio_alsa" },
+#ifdef YAMAHAPLAYER
+ { AID_MEDIA, "media.yamahaplayer" },
+#endif
+#ifdef SECTVOUT
+ { AID_MEDIA, "SecTVOutService" },
+#endif
{ AID_DRM, "drm.drmManager" },
{ AID_NFC, "nfc" },
{ AID_BLUETOOTH, "bluetooth" },