diff options
| author | 2010-07-15 18:21:33 -0700 | |
|---|---|---|
| committer | 2010-07-15 18:21:33 -0700 | |
| commit | 2c43b6cee14cde6721689239e47d32319dbbf6ee (patch) | |
| tree | 27797a6410aeeb60e9cbc622524c75a6e698d171 | |
| parent | 7ccdfbee63ee482f294becbc5b5e5e1807fbda43 (diff) | |
| parent | d9452ecd0ce6c8e0518055929ba1fd0712146405 (diff) | |
am d9452ecd: Merge "Fix jni registration typo" into gingerbread
Merge commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405' into gingerbread-plus-aosp
* commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405':
Fix jni registration typo
| -rw-r--r-- | core/jni/android_app_NativeActivity.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_app_NativeActivity.cpp b/core/jni/android_app_NativeActivity.cpp index 0b2b5077d321..9f042c22f210 100644 --- a/core/jni/android_app_NativeActivity.cpp +++ b/core/jni/android_app_NativeActivity.cpp @@ -774,7 +774,7 @@ dispatchKeyEvent_native(JNIEnv* env, jobject clazz, jint handle, jobject eventOb } static const JNINativeMethod g_methods[] = { - { "loadNativeCode", "(Ljava/lang/String;Landroid/os/MessageQueue;Ljava/lang/String;Ljava/lang/String;I;Landroid/content/res/AssetManager)I", + { "loadNativeCode", "(Ljava/lang/String;Landroid/os/MessageQueue;Ljava/lang/String;Ljava/lang/String;ILandroid/content/res/AssetManager;)I", (void*)loadNativeCode_native }, { "unloadNativeCode", "(I)V", (void*)unloadNativeCode_native }, { "onStartNative", "(I)V", (void*)onStart_native }, |