diff options
| author | Brett Chabot <brettchabot@google.com> | 2019-05-31 11:15:09 -0700 |
|---|---|---|
| committer | Jerome Gaillard <jgaillard@google.com> | 2019-06-18 14:54:53 +0000 |
| commit | 858c2e7eed7ed18fef75d74c0d7178f6e12bd4ff (patch) | |
| tree | 64a9c57ded230a5c8eeef488c6e2c21e0a3194c4 /core/jni/LayoutlibLoader.cpp | |
| parent | 96dc7d98e2725c9174c0d1e396d7fc672f43e53e (diff) | |
Allow LayoutLibLoader customization.
Read NativeDelegates from a NativeConfig class instead of CreateInfo.
Read icu data dir from a System property.
Test: frameworks/layoutlib/bridge/tests/run_tests.sh
Change-Id: Ifbd5067aad36b2298c542031df9ccb950cfa0d28
(cherry picked from commit 2944f345a81a5bec2fa355fdf9556e0dbfb94cdd)
Diffstat (limited to 'core/jni/LayoutlibLoader.cpp')
| -rw-r--r-- | core/jni/LayoutlibLoader.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/jni/LayoutlibLoader.cpp b/core/jni/LayoutlibLoader.cpp index b0dbb68637a3..94064c1d28be 100644 --- a/core/jni/LayoutlibLoader.cpp +++ b/core/jni/LayoutlibLoader.cpp @@ -174,7 +174,8 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) { } // Get the names of classes that have to delegate their native methods - jclass createInfo = FindClassOrDie(env, "com/android/tools/layoutlib/create/CreateInfo"); + + jclass createInfo = FindClassOrDie(env, "com/android/tools/layoutlib/create/NativeConfig"); jfieldID arrayId = GetStaticFieldIDOrDie(env, createInfo, "DELEGATE_CLASS_NATIVES_TO_NATIVES", "[Ljava/lang/String;"); jobjectArray array = (jobjectArray) env->GetStaticObjectField(createInfo, arrayId); @@ -194,11 +195,15 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) { } // Set the location of ICU data - jclass bridge = FindClassOrDie(env, "com/android/layoutlib/bridge/Bridge"); - jstring stringPath = (jstring) env->CallStaticObjectMethod(bridge, - GetStaticMethodIDOrDie(env, bridge, "getIcuDataPath", "()Ljava/lang/String;")); + jclass system = FindClassOrDie(env, "java/lang/System"); + jmethodID getPropertyMethod = GetStaticMethodIDOrDie(env, system, "getProperty", + "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"); + jstring stringPath = (jstring) (jstring) env->CallStaticObjectMethod(system, + getPropertyMethod, env->NewStringUTF("icu.dir"), + env->NewStringUTF("")); const char* path = env->GetStringUTFChars(stringPath, 0); u_setDataDirectory(path); env->ReleaseStringUTFChars(stringPath, path); return JNI_VERSION_1_6; } + |