am 10b02df8: am 218f48d6: Merge "bundle init.rc contents with its service"

* commit '10b02df820ece261b621a1f46838995249a1082c':
  bundle init.rc contents with its service
This commit is contained in:
Tom Cherry 2015-08-21 18:31:27 +00:00 committed by Android Git Automerger
commit a9e2648184
3 changed files with 20 additions and 0 deletions

View file

@ -88,6 +88,8 @@ LOCAL_SRC_FILES := \
main.cpp \
$(common_src_files)
LOCAL_INIT_RC := vold.rc
LOCAL_C_INCLUDES := $(common_c_includes)
LOCAL_CFLAGS := $(vold_cflags)
LOCAL_CONLYFLAGS := $(vold_conlyflags)
@ -112,6 +114,7 @@ LOCAL_MODULE:= vdc
LOCAL_SHARED_LIBRARIES := libcutils
LOCAL_CFLAGS := $(vold_cflags)
LOCAL_CONLYFLAGS := $(vold_conlyflags)
LOCAL_INIT_RC := vdc.rc
include $(BUILD_EXECUTABLE)

13
vdc.rc Normal file
View file

@ -0,0 +1,13 @@
# One shot invocation to deal with encrypted volume.
service defaultcrypto /system/bin/vdc --wait cryptfs mountdefaultencrypted
disabled
oneshot
# vold will set vold.decrypt to trigger_restart_framework (default
# encryption) or trigger_restart_min_framework (other encryption)
# One shot invocation to encrypt unencrypted volumes
service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default
disabled
oneshot
# vold will set vold.decrypt to trigger_restart_framework (default
# encryption)

4
vold.rc Normal file
View file

@ -0,0 +1,4 @@
service vold /system/bin/vold
class core
socket vold stream 0660 root mount
ioprio be 2