diff options
| author | Michael Hoisie <hoisie@google.com> | 2023-12-06 22:08:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-06 22:08:58 +0000 |
| commit | b671c869b3cb8b0f2caa633e46dad8bd62648fee (patch) | |
| tree | 911083cf7801fdb154537aa4846cdea6e2ad584f | |
| parent | 3b3bd6ad264b7f773ab3ceef08ebde69d9162d96 (diff) | |
| parent | 75c86ec2163f7a6fedaa479d29248c0c11b6ba1c (diff) | |
| download | base-b671c869b3cb8b0f2caa633e46dad8bd62648fee.tar.gz | |
Merge "Change the system property used for ICU data" into android12-hostruntime-dev
| -rw-r--r-- | core/jni/RobolectricNativeRuntime.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/RobolectricNativeRuntime.cpp b/core/jni/RobolectricNativeRuntime.cpp index 0d41bd2d7be3..2aee419d15e2 100644 --- a/core/jni/RobolectricNativeRuntime.cpp +++ b/core/jni/RobolectricNativeRuntime.cpp @@ -119,7 +119,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) { // Set the location of ICU data auto stringPath = (jstring)env->CallStaticObjectMethod(system, getPropertyMethod, - env->NewStringUTF("icu.dir"), + env->NewStringUTF("icu.data.path"), env->NewStringUTF("")); const char* path = env->GetStringUTFChars(stringPath, 0); if (!fileExists(path)) { |