commit 2ebf239807f5d0fb9c0148b826a53e3e1d6fd076
author Neil Fuller <nfuller@google.com> Sat Dec 15 04:06:22 2018 -0800
committer android-build-merger <android-build-merger@google.com> Sat Dec 15 04:06:22 2018 -0800
tree 42b388510453874365ef8c496814a7d12087264c
parent fac6b4e65b9b5ec27b6b1087a7c3b805f5f89dc8
parent 1297a544d9afcc5c9db4e3cd38919b1622ff53de

Merge "Track movement of tz files into the runtime module" am: 7eabef54ee am: 70d9e5f320
am: 1297a544d9

Change-Id: Ieb5e88cba216cf66f5f3e9ae9c92aea314b8e70e

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 349168e..6fb1a8b 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -583,8 +583,8 @@
     # Set SELinux security contexts on upgrade or policy update.
     restorecon --recursive --skip-ce /data
 
-    # Check any timezone data in /data is newer than the copy in /system, delete if not.
-    exec - system system -- /system/bin/tzdatacheck /system/usr/share/zoneinfo /data/misc/zoneinfo
+    # Check any timezone data in /data is newer than the copy in the runtime module, delete if not.
+    exec - system system -- /system/bin/tzdatacheck /apex/com.android.runtime/etc/tz /data/misc/zoneinfo
 
     # If there is no post-fs-data action in the init.<device>.rc file, you
     # must uncomment this line, otherwise encrypted filesystems