diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-05 13:26:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-05 13:26:58 +0000 |
| commit | 3470cf8e2dafe1d648cf941131fd76ae1cca864a (patch) | |
| tree | b30851bd8cc33c1594364c18bd27b550da2ff538 | |
| parent | 41e8e279320a57bd96127f82a8b95a37a5e1f1d1 (diff) | |
| parent | e65751ae41e4841de9633c2e4033c8bb7588a542 (diff) | |
| download | native_bridge_support-3470cf8e2dafe1d648cf941131fd76ae1cca864a.tar.gz | |
Merge "Do not convert native methods" into main
| -rw-r--r-- | android_api/libandroid_runtime/proxy/android_runtime_trampolines.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/android_api/libandroid_runtime/proxy/android_runtime_trampolines.cc b/android_api/libandroid_runtime/proxy/android_runtime_trampolines.cc index 395eeab..f55786b 100644 --- a/android_api/libandroid_runtime/proxy/android_runtime_trampolines.cc +++ b/android_api/libandroid_runtime/proxy/android_runtime_trampolines.cc @@ -34,14 +34,10 @@ void DoCustomTrampoline__ZN7android14AndroidRuntime21registerNativeMethodsEP7_JN using PFN_callee = decltype(&android::AndroidRuntime::registerNativeMethods); auto [arg_env, arg_class_name, arg_methods, arg_n] = GuestParamsValues<PFN_callee>(state); - JNINativeMethod* host_methods = ConvertJNINativeMethods(arg_methods, arg_n); - auto&& [ret] = GuestReturnReference<PFN_callee>(state); - ret = - android::AndroidRuntime::registerNativeMethods(arg_env, arg_class_name, host_methods, arg_n); - - delete[] host_methods; + ret = android::AndroidRuntime::registerNativeMethods(arg_env, arg_class_name, + arg_methods, arg_n); } // TODO(b/278625630): This is not a standard library and will be deprecated. |