diff options
| author | Peter Qiu <zqiu@google.com> | 2015-09-28 14:26:25 -0700 |
|---|---|---|
| committer | Peter Qiu <zqiu@google.com> | 2015-09-29 20:10:30 +0000 |
| commit | 8070c3ad04f91b1745898407aa20bbb460f1874c (patch) | |
| tree | 2b38004eaf1a29c918baab29516b98324ef9a19b | |
| parent | 56e03e7819eab800e077513451cb4fce68ec6066 (diff) | |
| download | apmanager-8070c3ad04f91b1745898407aa20bbb460f1874c.tar.gz | |
Rename apmanager's Android init file
Android is using <service>.rc instead of init.<service>.rc.
While there, include the init file in the build target and
remove the seclabel from the init file.
Bug: 22828115
TEST=Manual test on dragonboard
Change-Id: Ia29cb197ec1ebca5d3003d62e9f24060bffd073a
| -rw-r--r-- | Android.mk | 12 | ||||
| -rw-r--r-- | apmanager.rc (renamed from init.apmanager.rc) | 1 |
2 files changed, 1 insertions, 12 deletions
@@ -88,7 +88,7 @@ include $(BUILD_STATIC_TEST_LIBRARY) # === apmanager === include $(CLEAR_VARS) LOCAL_MODULE := apmanager -#LOCAL_REQUIRED_MODULES := init.apmanager.rc +LOCAL_INIT_RC := apmanager.rc LOCAL_SRC_FILES := \ main.cc LOCAL_STATIC_LIBRARIES := libapmanager @@ -96,16 +96,6 @@ LOCAL_C_INCLUDES += external/gtest/include $(eval $(apmanager_common)) include $(BUILD_EXECUTABLE) -# === init.apmanager.rc (brillo only) === -ifdef TARGET_COPY_OUT_INITRCD -include $(CLEAR_VARS) -LOCAL_MODULE := init.apmanager.rc -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_INITRCD) -include $(BUILD_PREBUILT) -endif - # === unittest === include $(CLEAR_VARS) LOCAL_MODULE := apmanager_unittest diff --git a/init.apmanager.rc b/apmanager.rc index 98e03bb..7a30834 100644 --- a/init.apmanager.rc +++ b/apmanager.rc @@ -7,5 +7,4 @@ service apmanager /system/bin/apmanager class main user system group system dbus net_admin net_raw - seclabel u:r:brillo:s0 disabled |