Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff5be396 authored Aug 21, 2015 by Tom Cherry Committed by Gerrit Code Review Aug 21, 2015

Merge changes from topic 'init-rc-breakup'

* changes:
  init: Queue Triggers instead of Actions
  bundle init.rc contents with its service

parents 8a4beeb6 cb716f97

adb/Android.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -277,6 +277,8 @@ endif

	LOCAL_MODULE := adbd		LOCAL_MODULE := adbd

			LOCAL_INIT_RC := adbd.rc

	LOCAL_FORCE_STATIC_EXECUTABLE := true		LOCAL_FORCE_STATIC_EXECUTABLE := true
	LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)		LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)
	LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)		LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)

adb/adbd.rc

0 → 100644

+14 −0

Original line number	Original line	Diff line number	Diff line
			on post-fs-data
			mkdir /data/misc/adb 02750 system shell
			mkdir /data/adb 0700 root root

			# adbd is controlled via property triggers in init.<platform>.usb.rc
			service adbd /sbin/adbd --root_seclabel=u:r:su:s0
			class core
			socket adbd stream 660 system system
			disabled
			seclabel u:r:adbd:s0

			# adbd on at boot in emulator
			on property:ro.kernel.qemu=1
			start adbd

debuggerd/Android.mk

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,9 @@ LOCAL_SRC_FILES_x86_64 := x86_64/machine.cpp

	LOCAL_CPPFLAGS := $(common_cppflags)		LOCAL_CPPFLAGS := $(common_cppflags)

			LOCAL_INIT_RC_32 := debuggerd.rc
			LOCAL_INIT_RC_64 := debuggerd64.rc

	ifeq ($(TARGET_IS_64_BIT),true)		ifeq ($(TARGET_IS_64_BIT),true)
	LOCAL_CPPFLAGS += -DTARGET_IS_64_BIT		LOCAL_CPPFLAGS += -DTARGET_IS_64_BIT
	endif		endif

debuggerd/debuggerd.rc

0 → 100644

+2 −0

Original line number	Original line	Diff line number	Diff line
			service debuggerd /system/bin/debuggerd
			class main

debuggerd/debuggerd64.rc

0 → 100644

+2 −0

Original line number	Original line	Diff line number	Diff line
			service debuggerd64 /system/bin/debuggerd64
			class main