Merge "Revert "Track movement of ICU .dat file""

This commit is contained in:
Neil Fuller 2018-12-11 20:20:14 +00:00 committed by Gerrit Code Review
commit 24bddbe949

View file

@ -58,8 +58,7 @@ static int __icu_dat_file_filter(const dirent* dirp) {
static bool __find_icu() {
dirent** namelist = nullptr;
int n = scandir("/apex/com.android.runtime/etc/icu", &namelist, &__icu_dat_file_filter,
alphasort);
int n = scandir("/system/usr/icu", &namelist, &__icu_dat_file_filter, alphasort);
int max_version = -1;
while (n--) {
// We prefer the latest version available.