diff options
| author | 2013-01-24 12:42:14 -0800 | |
|---|---|---|
| committer | 2013-01-30 16:48:31 -0800 | |
| commit | 2dd0e2cea360bc9206eb88ecc40d259e796c239d (patch) | |
| tree | 9d619dc9508cbe73e4793bf6f08cbc761abfb48a /src/native/java_lang_Runtime.cc | |
| parent | ac21b797b3a425975d656d6b84a7b24401d35f42 (diff) | |
Directory restructuring of object.h
Break object.h into constituent files.
Reduce number of #includes in other GC header files.
Introduce -inl.h files to avoid mirror files #include-ing each other.
Check invariants of verifier RegTypes for all constructors.
Change-Id: Iecf1171c02910ac152d52947330ef456df4043bc
Diffstat (limited to 'src/native/java_lang_Runtime.cc')
| -rw-r--r-- | src/native/java_lang_Runtime.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/native/java_lang_Runtime.cc b/src/native/java_lang_Runtime.cc index d197b7340f..54ccddc9f0 100644 --- a/src/native/java_lang_Runtime.cc +++ b/src/native/java_lang_Runtime.cc @@ -18,10 +18,9 @@ #include <limits.h> #include <unistd.h> -#include "class_loader.h" #include "heap.h" #include "jni_internal.h" -#include "object.h" +#include "mirror/class_loader.h" #include "runtime.h" #include "scoped_thread_state_change.h" #include "ScopedUtfChars.h" @@ -59,7 +58,7 @@ static jstring Runtime_nativeLoad(JNIEnv* env, jclass, jstring javaFilename, job } } - ClassLoader* classLoader = soa.Decode<ClassLoader*>(javaLoader); + mirror::ClassLoader* classLoader = soa.Decode<mirror::ClassLoader*>(javaLoader); std::string detail; JavaVMExt* vm = Runtime::Current()->GetJavaVM(); bool success = vm->LoadNativeLibrary(filename.c_str(), classLoader, detail); |