diff options
| author | Neil Fuller <nfuller@google.com> | 2019-01-13 16:22:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-13 16:22:59 +0000 |
| commit | 29d2de02c5111e5ee5d9537855e878989dd0fc1a (patch) | |
| tree | fa7a29faf9e2f0a61c15d788ce314d58a7582da5 | |
| parent | 559e2a60ae771f45c4b07fb53aa9c49bc225090a (diff) | |
| parent | 1d5f1c2e1b4fed940fb274ff0cb0f84ad892c096 (diff) | |
| download | minikin-oreo-mr1-iot-release.tar.gz | |
Merge "Track movement of ICU .dat file"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-release
| -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; |