From 868de7d4efcc0e3bc335ef4a13e5834fc3b48795 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 20 Nov 2013 18:09:50 +0100 Subject: [PATCH] (Android) jni_params struct -remove class_obj --- android/native/jni/jni_macros.h | 1 - frontend/platform/platform_android.c | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/android/native/jni/jni_macros.h b/android/native/jni/jni_macros.h index 6c50ef9693..894bc2f97a 100644 --- a/android/native/jni/jni_macros.h +++ b/android/native/jni/jni_macros.h @@ -21,7 +21,6 @@ struct jni_params { - jobject class_obj; char class_name[128]; char method_name[128]; char method_signature[128]; diff --git a/frontend/platform/platform_android.c b/frontend/platform/platform_android.c index c1f1e89ca9..9181faa9d7 100644 --- a/frontend/platform/platform_android.c +++ b/frontend/platform/platform_android.c @@ -279,9 +279,9 @@ static void jni_get(void *data, void *data_in, void *data_out) if (!env) return; - GET_OBJECT_CLASS(env, class, in_params->class_obj); + GET_OBJECT_CLASS(env, class, android_app->activity->clazz); GET_METHOD_ID(env, giid, class, in_params->method_name, in_params->method_signature); - CALL_OBJ_METHOD(env, obj, in_params->class_obj, giid); + CALL_OBJ_METHOD(env, obj, class, giid); if (in_params->submethod_name && in_params->submethod_signature) @@ -307,14 +307,11 @@ static void get_environment_settings(int argc, char *argv[], void *data) struct jni_params in_params; struct jni_out_params_char out_args; - in_params.class_obj = android_app->activity->clazz; - strlcpy(in_params.method_name, "getIntent", sizeof(in_params.method_name)); strlcpy(in_params.method_signature, "()Landroid/content/Intent;", sizeof(in_params.method_signature)); strlcpy(in_params.submethod_name, "getStringExtra", sizeof(in_params.submethod_name)); strlcpy(in_params.submethod_signature, "(Ljava/lang/String;)Ljava/lang/String;", sizeof(in_params.submethod_signature)); - // ROM out_args.out = g_extern.fullpath; out_args.out_sizeof = sizeof(g_extern.fullpath);