commit 62d8d9fc8fe48e451704ebf889c3ac6109ce9742
author Neil Fuller <nfuller@google.com> Tue Dec 11 20:30:00 2018 +0000
committer Neil Fuller <nfuller@google.com> Wed Jan 09 15:27:02 2019 +0000
tree 26aeb76ebc556f75f6da0307315e6eae8e695af6
parent 43889f5e2c05cc4c324d3b8fc186077ac02b0170

Track movement of ICU .dat file

Track movement of ICU .dat file into the runtime module

This reverts commit b9e7b699a2e22333e4f844e2d37d222f4c5451c5.
This is a reapply of commit 68c6bd8b43f03f7d2ffc81d3490a754e21803a30

Bug: 120853401
Bug: 119293618
Test: build / boot
Change-Id: I69e0dde2756da64ac0b17f1726145dccacf5961f

libc/bionic/icu.cpp

diff --git a/libc/bionic/icu.cpp b/libc/bionic/icu.cpp
index 7c44f97..41a0729 100644
--- a/libc/bionic/icu.cpp
+++ b/libc/bionic/icu.cpp
@@ -58,7 +58,8 @@
 
 static bool __find_icu() {
   dirent** namelist = nullptr;
-  int n = scandir("/system/usr/icu", &namelist, &__icu_dat_file_filter, alphasort);
+  int n = scandir("/apex/com.android.runtime/etc/icu", &namelist, &__icu_dat_file_filter,
+                  alphasort);
   if (n < 0) {
     async_safe_write_log(ANDROID_LOG_ERROR, "bionic-icu", "couldn't find ICU folder");
     return false;