diff options
| author | Elliott Hughes <enh@google.com> | 2010-04-16 17:44:12 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2010-04-16 17:44:12 -0700 |
| commit | c08f9fb2a3be82bb1a3f477ca1524ddcf7a1d4b8 (patch) | |
| tree | cc325048a7dc4cb15eb2f39244c3b881b284644d /icu/src/main/native/NativeConverter.cpp | |
| parent | 757a7942eed2b0aa457f8517a0259d2ac82c5b18 (diff) | |
| download | libcore-c08f9fb2a3be82bb1a3f477ca1524ddcf7a1d4b8.zip libcore-c08f9fb2a3be82bb1a3f477ca1524ddcf7a1d4b8.tar.gz libcore-c08f9fb2a3be82bb1a3f477ca1524ddcf7a1d4b8.tar.bz2 | |
Move the libcore registration out of libnativehelpers and into libcore.
Bug: 754114
Change-Id: Iaa03def509c10cbaa12fd2128584b93d4be4a6b7
Diffstat (limited to 'icu/src/main/native/NativeConverter.cpp')
| -rw-r--r-- | icu/src/main/native/NativeConverter.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/icu/src/main/native/NativeConverter.cpp b/icu/src/main/native/NativeConverter.cpp index f227f3d..8cc6d15 100644 --- a/icu/src/main/native/NativeConverter.cpp +++ b/icu/src/main/native/NativeConverter.cpp @@ -17,7 +17,6 @@ #define LOG_TAG "NativeConverter" -#include "AndroidSystemNatives.h" #include "ErrorCode.h" #include "JNIHelp.h" #include "ScopedUtfChars.h" @@ -989,11 +988,7 @@ static jobject charsetForName(JNIEnv* env, jclass, jstring charsetName) { javaCanonicalName, env->NewStringUTF(icuCanonicalName), aliases); } -/* - * JNI registration - */ static JNINativeMethod gMethods[] = { - /* name, signature, funcPtr */ { "canEncode", "(JI)Z", (void*) canEncode }, { "charsetForName", "(Ljava/lang/String;)Ljava/nio/charset/Charset;", (void*) charsetForName }, { "closeConverter", "(J)V", (void*) closeConverter }, @@ -1017,8 +1012,7 @@ static JNINativeMethod gMethods[] = { { "setSubstitutionBytes", "(J[BI)I", (void*) setSubstitutionBytes }, { "setSubstitutionChars", "(J[CI)I", (void*) setSubstitutionChars }, }; - -int register_com_ibm_icu4jni_converters_NativeConverter(JNIEnv *_env) { - return jniRegisterNativeMethods(_env, "com/ibm/icu4jni/charset/NativeConverter", +int register_com_ibm_icu4jni_converters_NativeConverter(JNIEnv* env) { + return jniRegisterNativeMethods(env, "com/ibm/icu4jni/charset/NativeConverter", gMethods, NELEM(gMethods)); } |