diff options
| author | Gilad Arnold <garnold@google.com> | 2015-08-28 08:19:47 -0700 |
|---|---|---|
| committer | Gilad Arnold <garnold@google.com> | 2015-08-28 08:39:28 -0700 |
| commit | 6198a2fae5cc4f2ccd3ee29160605cab75d7418c (patch) | |
| tree | 87f0b067b1c10124df1cd3de2e73244e9e365f0b | |
| parent | 793a81172b131dda5b85e009496344e24cfeab9f (diff) | |
| download | tlsdate-6198a2fae5cc4f2ccd3ee29160605cab75d7418c.tar.gz | |
Rename init.tlsdated.rc and tie it to the correct build target.
1) With the new Android initrc installation schema, all init files are
simply named <daemon_name>.rc. No reason to be different.
2) Actually tie it to tlsdated (and not tlsdated_unittest).
Bug: 22373707
Change-Id: Icb0bc5794da81b81683982f5cae3056c2859877c
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | init/tlsdated.rc (renamed from init/init.tlsdated.rc) | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -65,6 +65,7 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_MODULE := tlsdated +LOCAL_INIT_RC := init/tlsdated.rc LOCAL_SRC_FILES := $(tlsdate_tlsdated_sources) LOCAL_CFLAGS := -DTLSDATED_MAIN LOCAL_SHARED_LIBRARIES := $(tlsdate_common_shared_libs) @@ -74,7 +75,6 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_MODULE := tlsdated_unittest -LOCAL_INIT_RC := init/init.tlsdated.rc LOCAL_SRC_FILES := \ src/tlsdated-unittest.c \ $(tlsdate_tlsdated_sources) diff --git a/init/init.tlsdated.rc b/init/tlsdated.rc index 62e7861..b91b329 100644 --- a/init/init.tlsdated.rc +++ b/init/tlsdated.rc @@ -1,3 +1,4 @@ +# Init file for starting tlsdated on Android. service tlsdated /system/bin/tlsdated -v -l -s -- /system/bin/tlsdate -v -C /system/etc/security/cacerts -l class main # TODO(b/23601841) Use a lesser uid once CAP_SYS_TIME is enabled. |