From c71a48ba555646672dbf19abf4e6db6b38b3cd42 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Sun, 9 Dec 2018 14:44:53 +0000 Subject: [PATCH] Track movement of tz files into the runtime module The main "base" copy of time zone data is now found in the runtime module. The system files will likely be deleted. Test: CTS: run cts -m CtsHostTzDataTests Test: PTS (cp'd to internal master): run pts -m PtsTimeZoneTestCases Bug: 116191025 Bug: 119293618 Bug: 113373927 Test: build / boot with logcat inspection Change-Id: I8dc8ff0d17aac124262d9c7c54abce61d97397e5 --- rootdir/init.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index 349168e2e..6fb1a8b0f 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -583,8 +583,8 @@ on post-fs-data # 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..rc file, you # must uncomment this line, otherwise encrypted filesystems