diff options
| author | Ian Rogers <irogers@google.com> | 2014-07-17 11:09:10 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-08-08 08:29:53 -0700 |
| commit | 68d8b42ddec39ec0174162d90d4abaa004d1983e (patch) | |
| tree | 0bb6ccf3b996bb8363c10d07aa39cde221980602 /runtime/utils.h | |
| parent | 9c522c2cbbf50dc687728747b37ad59985750b65 (diff) | |
| download | android_art-68d8b42ddec39ec0174162d90d4abaa004d1983e.tar.gz android_art-68d8b42ddec39ec0174162d90d4abaa004d1983e.tar.bz2 android_art-68d8b42ddec39ec0174162d90d4abaa004d1983e.zip | |
Wire up check JNI force copy mode.
Increase check JNI checks.
Break apart jni_internal.h in to jni_env_ext.h and java_vm_ext.h.
Fix the abuse of ScopedObjectAccess/annotalysis by ScopedCheck in the case
of VM routines.
Make class loader override and shared library class loader JNI global
references rather than mirror pointers.
Clean-ups to native bridge.
Change-Id: If7c6110b5aade7a402bfb67534af86a7b2cdeb55
Diffstat (limited to 'runtime/utils.h')
| -rw-r--r-- | runtime/utils.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/runtime/utils.h b/runtime/utils.h index 49bcbf9ea7..f6773be289 100644 --- a/runtime/utils.h +++ b/runtime/utils.h @@ -24,13 +24,10 @@ #include <vector> #include "base/logging.h" +#include "base/mutex.h" #include "globals.h" #include "instruction_set.h" -#include "base/mutex.h" - -#ifdef HAVE_ANDROID_OS -#include "cutils/properties.h" -#endif +#include "primitive.h" namespace art { @@ -279,6 +276,7 @@ std::string PrettyDescriptor(mirror::String* descriptor) std::string PrettyDescriptor(const std::string& descriptor); std::string PrettyDescriptor(mirror::Class* klass) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); +std::string PrettyDescriptor(Primitive::Type type); // Returns a human-readable signature for 'f'. Something like "a.b.C.f" or // "int a.b.C.f" (depending on the value of 'with_type'). |