diff options
| author | Ian Rogers <irogers@google.com> | 2014-02-12 01:16:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-12 01:16:30 +0000 |
| commit | fd14755c09ada4769b5b6658e484441ca3f628b5 (patch) | |
| tree | c70c10b6e319f44dadb56c78acaf7ce89b502d82 /runtime/jni_internal.h | |
| parent | 3c976a8f82007285316dd9d1bbccb659b0668a06 (diff) | |
| parent | 0177e53ea521ad58b70c305700dab32f1ac773b7 (diff) | |
| download | android_art-fd14755c09ada4769b5b6658e484441ca3f628b5.tar.gz android_art-fd14755c09ada4769b5b6658e484441ca3f628b5.tar.bz2 android_art-fd14755c09ada4769b5b6658e484441ca3f628b5.zip | |
Merge "Work in the direction of hard float quick ABIs."
Diffstat (limited to 'runtime/jni_internal.h')
| -rw-r--r-- | runtime/jni_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/jni_internal.h b/runtime/jni_internal.h index 26905c7a27..9e109875cd 100644 --- a/runtime/jni_internal.h +++ b/runtime/jni_internal.h @@ -57,7 +57,7 @@ void RegisterNativeMethods(JNIEnv* env, const char* jni_class_name, const JNINat JValue InvokeWithJValues(const ScopedObjectAccess&, jobject obj, jmethodID mid, jvalue* args) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void InvokeWithArgArray(const ScopedObjectAccess& soa, mirror::ArtMethod* method, - ArgArray *arg_array, JValue* result, char result_type) + ArgArray *arg_array, JValue* result, const char* shorty) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); int ThrowNewException(JNIEnv* env, jclass exception_class, const char* msg, jobject cause); |