Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c71a48ba authored by Neil Fuller's avatar Neil Fuller
Browse files

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
parent b81bc9ec
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -583,8 +583,8 @@ on post-fs-data
    # Set SELinux security contexts on upgrade or policy update.
    # Set SELinux security contexts on upgrade or policy update.
    restorecon --recursive --skip-ce /data
    restorecon --recursive --skip-ce /data


    # Check any timezone data in /data is newer than the copy in /system, delete if not.
    # Check any timezone data in /data is newer than the copy in the runtime module, delete if not.
    exec - system system -- /system/bin/tzdatacheck /system/usr/share/zoneinfo /data/misc/zoneinfo
    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
    # If there is no post-fs-data action in the init.<device>.rc file, you
    # must uncomment this line, otherwise encrypted filesystems
    # must uncomment this line, otherwise encrypted filesystems