commit b9e7b699a2e22333e4f844e2d37d222f4c5451c5
author Neil Fuller <nfuller@google.com> Tue Dec 11 20:09:51 2018 +0000
committer Neil Fuller <nfuller@google.com> Tue Dec 11 20:11:58 2018 +0000
tree 3ebeb19b4e6d4da4aac3bbcedf8be3dc03180923
parent 68c6bd8b43f03f7d2ffc81d3490a754e21803a30

Revert "Track movement of ICU .dat file"

This reverts commit 68c6bd8b43f03f7d2ffc81d3490a754e21803a30.

Reason for revert: Broke ART test environments and emulator devices.

Bug: 119293618
Change-Id: I1b0531d13c6565ce83801d93c78813af592eec1a

libc/bionic/icu.cpp

diff --git a/libc/bionic/icu.cpp b/libc/bionic/icu.cpp
index 7f2a803..c09c9ea 100644
--- a/libc/bionic/icu.cpp
+++ b/libc/bionic/icu.cpp
@@ -58,8 +58,7 @@
 
 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.