diff options
| author | Elliott Hughes <enh@google.com> | 2010-10-01 18:17:30 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2010-10-01 18:17:30 -0700 |
| commit | c27a366a89e470690e99374b15270e7b9169ade1 (patch) | |
| tree | 0b3755984193a1a6769cabb28c76af2d3e15ccf6 /luni/src/main/native/Register.cpp | |
| parent | 162b0775772fa66b7eb634760a8159a60c1ddcea (diff) | |
| download | libcore-c27a366a89e470690e99374b15270e7b9169ade1.zip libcore-c27a366a89e470690e99374b15270e7b9169ade1.tar.gz libcore-c27a366a89e470690e99374b15270e7b9169ade1.tar.bz2 | |
More icu4jni reshuffling.
Bug: 3045778
Change-Id: Iafb367f97d1fb169c6106adad0525cfcc0e10f25
Diffstat (limited to 'luni/src/main/native/Register.cpp')
| -rw-r--r-- | luni/src/main/native/Register.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/luni/src/main/native/Register.cpp b/luni/src/main/native/Register.cpp index 56bfc28..64c0e84 100644 --- a/luni/src/main/native/Register.cpp +++ b/luni/src/main/native/Register.cpp @@ -25,11 +25,7 @@ namespace android { extern int register_dalvik_system_TouchDex(JNIEnv* env); } -extern int register_com_ibm_icu4jni_converters_NativeConverter(JNIEnv* env); -extern int register_com_ibm_icu4jni_text_NativeBreakIterator(JNIEnv* env); extern int register_com_ibm_icu4jni_text_NativeCollator(JNIEnv* env); -extern int register_com_ibm_icu4jni_text_NativeDecimalFormat(JNIEnv* env); -extern int register_com_ibm_icu4jni_util_ICU(JNIEnv* env); extern int register_java_io_Console(JNIEnv* env); extern int register_java_io_File(JNIEnv* env); extern int register_java_io_FileDescriptor(JNIEnv* env); @@ -55,6 +51,10 @@ extern int register_java_util_zip_Adler32(JNIEnv* env); extern int register_java_util_zip_CRC32(JNIEnv* env); extern int register_java_util_zip_Deflater(JNIEnv* env); extern int register_java_util_zip_Inflater(JNIEnv* env); +extern int register_libcore_icu_ICU(JNIEnv* env); +extern int register_libcore_icu_NativeBreakIterator(JNIEnv* env); +extern int register_libcore_icu_NativeConverter(JNIEnv* env); +extern int register_libcore_icu_NativeDecimalFormat(JNIEnv* env); extern int register_libcore_icu_NativeIDN(JNIEnv* env); extern int register_libcore_icu_NativeNormalizer(JNIEnv* env); extern int register_libcore_icu_NativePluralRules(JNIEnv* env); @@ -76,11 +76,7 @@ extern "C" int registerCoreLibrariesJni(JNIEnv* env) { JniConstants::init(env); bool result = - register_com_ibm_icu4jni_converters_NativeConverter(env) != -1 && - register_com_ibm_icu4jni_text_NativeBreakIterator(env) != -1 && register_com_ibm_icu4jni_text_NativeCollator(env) != -1 && - register_com_ibm_icu4jni_text_NativeDecimalFormat(env) != -1 && - register_com_ibm_icu4jni_util_ICU(env) != -1 && register_java_io_Console(env) != -1 && register_java_io_File(env) != -1 && register_java_io_FileDescriptor(env) != -1 && @@ -106,6 +102,10 @@ extern "C" int registerCoreLibrariesJni(JNIEnv* env) { register_java_util_zip_CRC32(env) != -1 && register_java_util_zip_Deflater(env) != -1 && register_java_util_zip_Inflater(env) != -1 && + register_libcore_icu_ICU(env) != -1 && + register_libcore_icu_NativeBreakIterator(env) != -1 && + register_libcore_icu_NativeConverter(env) != -1 && + register_libcore_icu_NativeDecimalFormat(env) != -1 && register_libcore_icu_NativeIDN(env) != -1 && register_libcore_icu_NativeNormalizer(env) != -1 && register_libcore_icu_NativePluralRules(env) != -1 && |