commit 68c6bd8b43f03f7d2ffc81d3490a754e21803a30
author Neil Fuller <nfuller@google.com> Tue Nov 13 10:23:02 2018 +0000
committer Neil Fuller <nfuller@google.com> Sun Dec 09 15:01:43 2018 +0000
tree 20fc35686690fa2316207b9853bad5330af7870f
parent 4e33c4ff9b7e29a923b00a42669bef88c76f93fe

Track movement of ICU .dat file

Track movement of ICU .dat file into the runtime module.

Bug: 119293618
Test: build / boot
Change-Id: I595c0c94ea7f693810fbe323d7966d9fdf4a07e6

libc/bionic/icu.cpp

diff --git a/libc/bionic/icu.cpp b/libc/bionic/icu.cpp
index c09c9ea..7f2a803 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);
   int max_version = -1;
   while (n--) {
     // We prefer the latest version available.