Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow LayoutLibLoader customization.

Browse Source 
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)
This commit is contained in:
Brett Chabot
2019-05-31 11:15:09 -07:00
committed by Jerome Gaillard
parent 96dc7d98e2
commit 858c2e7eed
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/jni/LayoutlibLoader.cpp
View File

@@ -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;
}