aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilad Arnold <garnold@google.com>2015-08-28 16:08:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-28 16:08:59 +0000
commit2fca20907d8b0ec69d9038b25a689bac464c9af3 (patch)
tree87f0b067b1c10124df1cd3de2e73244e9e365f0b
parentbcfac86c200c3563abd2546963dcb1870a6b48a6 (diff)
parent6198a2fae5cc4f2ccd3ee29160605cab75d7418c (diff)
downloadtlsdate-2fca20907d8b0ec69d9038b25a689bac464c9af3.tar.gz
am 6198a2fa: Rename init.tlsdated.rc and tie it to the correct build target.
* commit '6198a2fae5cc4f2ccd3ee29160605cab75d7418c': Rename init.tlsdated.rc and tie it to the correct build target.
-rw-r--r--Android.mk2
-rw-r--r--init/tlsdated.rc (renamed from init/init.tlsdated.rc)1
2 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 4864fa3..889cf79 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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.