summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cherry2015-08-14 15:01:23 -0500
committerTom Cherry2015-08-19 19:26:29 -0500
commit74155996d931edbd19ed5b3f71a58ceff920b451 (patch)
treebe7afc033e0103579ab9a8b5d68e356cbf71fe17
parentd974a3647bd371886093738ab16485c943cb5bad (diff)
downloadframeworks-native-74155996d931edbd19ed5b3f71a58ceff920b451.tar.gz
frameworks-native-74155996d931edbd19ed5b3f71a58ceff920b451.tar.xz
frameworks-native-74155996d931edbd19ed5b3f71a58ceff920b451.zip
bundle init.rc contents with its service
Bug: 23186545 Change-Id: I2a70a39122b146d5bbc9b55156e769782e011bff
-rw-r--r--cmds/dumpstate/Android.mk1
-rw-r--r--cmds/dumpstate/dumpstate.rc5
-rw-r--r--cmds/installd/Android.mk1
-rw-r--r--cmds/installd/installd.rc3
-rw-r--r--cmds/servicemanager/Android.mk1
-rw-r--r--cmds/servicemanager/servicemanager.rc10
-rw-r--r--services/surfaceflinger/Android.mk2
-rw-r--r--services/surfaceflinger/surfaceflinger.rc5
8 files changed, 28 insertions, 0 deletions
diff --git a/cmds/dumpstate/Android.mk b/cmds/dumpstate/Android.mk
index 9065ee1d2..8c7c4a840 100644
--- a/cmds/dumpstate/Android.mk
+++ b/cmds/dumpstate/Android.mk
@@ -17,5 +17,6 @@ LOCAL_MODULE := dumpstate
17LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux 17LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux
18LOCAL_HAL_STATIC_LIBRARIES := libdumpstate 18LOCAL_HAL_STATIC_LIBRARIES := libdumpstate
19LOCAL_CFLAGS += -Wall -Wno-unused-parameter -std=gnu99 19LOCAL_CFLAGS += -Wall -Wno-unused-parameter -std=gnu99
20LOCAL_INIT_RC := dumpstate.rc
20 21
21include $(BUILD_EXECUTABLE) 22include $(BUILD_EXECUTABLE)
diff --git a/cmds/dumpstate/dumpstate.rc b/cmds/dumpstate/dumpstate.rc
new file mode 100644
index 000000000..cd5d6c4d5
--- /dev/null
+++ b/cmds/dumpstate/dumpstate.rc
@@ -0,0 +1,5 @@
1service dumpstate /system/bin/dumpstate -s
2 class main
3 socket dumpstate stream 0660 shell log
4 disabled
5 oneshot
diff --git a/cmds/installd/Android.mk b/cmds/installd/Android.mk
index 6dec7f689..eaeeb2226 100644
--- a/cmds/installd/Android.mk
+++ b/cmds/installd/Android.mk
@@ -38,5 +38,6 @@ LOCAL_SHARED_LIBRARIES := \
38 38
39LOCAL_STATIC_LIBRARIES := libdiskusage 39LOCAL_STATIC_LIBRARIES := libdiskusage
40LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk 40LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
41LOCAL_INIT_RC := installd.rc
41LOCAL_CLANG := true 42LOCAL_CLANG := true
42include $(BUILD_EXECUTABLE) 43include $(BUILD_EXECUTABLE)
diff --git a/cmds/installd/installd.rc b/cmds/installd/installd.rc
new file mode 100644
index 000000000..5e4c925d2
--- /dev/null
+++ b/cmds/installd/installd.rc
@@ -0,0 +1,3 @@
1service installd /system/bin/installd
2 class main
3 socket installd stream 600 system system
diff --git a/cmds/servicemanager/Android.mk b/cmds/servicemanager/Android.mk
index 155cfc503..7ee0dd184 100644
--- a/cmds/servicemanager/Android.mk
+++ b/cmds/servicemanager/Android.mk
@@ -22,4 +22,5 @@ LOCAL_SHARED_LIBRARIES := liblog libselinux
22LOCAL_SRC_FILES := service_manager.c binder.c 22LOCAL_SRC_FILES := service_manager.c binder.c
23LOCAL_CFLAGS += $(svc_c_flags) 23LOCAL_CFLAGS += $(svc_c_flags)
24LOCAL_MODULE := servicemanager 24LOCAL_MODULE := servicemanager
25LOCAL_INIT_RC := servicemanager.rc
25include $(BUILD_EXECUTABLE) 26include $(BUILD_EXECUTABLE)
diff --git a/cmds/servicemanager/servicemanager.rc b/cmds/servicemanager/servicemanager.rc
new file mode 100644
index 000000000..e73516dbb
--- /dev/null
+++ b/cmds/servicemanager/servicemanager.rc
@@ -0,0 +1,10 @@
1service servicemanager /system/bin/servicemanager
2 class core
3 user system
4 group system
5 critical
6 onrestart restart healthd
7 onrestart restart zygote
8 onrestart restart media
9 onrestart restart surfaceflinger
10 onrestart restart drm
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
index 1eb23616c..17ca10e9b 100644
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
@@ -122,6 +122,8 @@ LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--e
122LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\" 122LOCAL_CFLAGS := -DLOG_TAG=\"SurfaceFlinger\"
123LOCAL_CPPFLAGS := -std=c++11 123LOCAL_CPPFLAGS := -std=c++11
124 124
125LOCAL_INIT_RC := surfaceflinger.rc
126
125LOCAL_SRC_FILES := \ 127LOCAL_SRC_FILES := \
126 main_surfaceflinger.cpp 128 main_surfaceflinger.cpp
127 129
diff --git a/services/surfaceflinger/surfaceflinger.rc b/services/surfaceflinger/surfaceflinger.rc
new file mode 100644
index 000000000..718b6b65f
--- /dev/null
+++ b/services/surfaceflinger/surfaceflinger.rc
@@ -0,0 +1,5 @@
1service surfaceflinger /system/bin/surfaceflinger
2 class core
3 user system
4 group graphics drmrpc
5 onrestart restart zygote