diff options
| author | Neil Fuller <nfuller@google.com> | 2019-01-13 08:38:03 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-13 08:38:03 -0800 |
| commit | e913f012dd8911f7b71cc8523e9bb8db9176c8d9 (patch) | |
| tree | fa7a29faf9e2f0a61c15d788ce314d58a7582da5 | |
| parent | 792f850d4f6ab7de3f55e90b77c128103e21b84c (diff) | |
| parent | 65c6b53ed4066e63259b62825a3933d1741c8ace (diff) | |
| download | minikin-e913f012dd8911f7b71cc8523e9bb8db9176c8d9.tar.gz | |
Merge "Track movement of ICU .dat file" am: 29d2de02c5
am: 65c6b53ed4
Change-Id: I3a3a6a893e3f8f2d1d44a0ecd48ebda3393826ba
| -rw-r--r-- | tests/perftests/main.cpp | 2 | ||||
| -rw-r--r-- | tests/unittest/ICUEnvironment.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/perftests/main.cpp b/tests/perftests/main.cpp index 142b396..afb3fc7 100644 --- a/tests/perftests/main.cpp +++ b/tests/perftests/main.cpp @@ -23,7 +23,7 @@ #include <unicode/udata.h> int main(int argc, char** argv) { - const char* fn = "/system/usr/icu/" U_ICUDATA_NAME ".dat"; + const char* fn = "/apex/com.google.runtime/etc/icu/" U_ICUDATA_NAME ".dat"; int fd = open(fn, O_RDONLY); LOG_ALWAYS_FATAL_IF(fd == -1); struct stat st; diff --git a/tests/unittest/ICUEnvironment.h b/tests/unittest/ICUEnvironment.h index 0dfb3f7..8618d31 100644 --- a/tests/unittest/ICUEnvironment.h +++ b/tests/unittest/ICUEnvironment.h @@ -37,7 +37,7 @@ public: size_t mSize; virtual void SetUp() override { - const char* fn = "/system/usr/icu/" U_ICUDATA_NAME ".dat"; + const char* fn = "/apex/com.android.runtime/etc/icu/" U_ICUDATA_NAME ".dat"; int fd = open(fn, O_RDONLY); LOG_ALWAYS_FATAL_IF(fd == -1); struct stat sb; |