DO NOT MERGE Fix all unsafe caching to be like libcore.
This way, if a runtime is restarted within a process, we re-initialize all
the cached data.
Conflicts:
src/native/java_lang_Runtime.cc -- nativeExit lost an argument in dalvik-dev
(cherry picked from commit 7756d5473fa27ce7e6ac7c31770eef7030431da4)
Change-Id: I6184fc20c2a9ec16c4b053584a4d1c3b64452d0f
diff --git a/src/native/java_lang_VMClassLoader.cc b/src/native/java_lang_VMClassLoader.cc
index 3d96c47..a976933 100644
--- a/src/native/java_lang_VMClassLoader.cc
+++ b/src/native/java_lang_VMClassLoader.cc
@@ -19,8 +19,6 @@
#include "ScopedUtfChars.h"
#include "zip_archive.h"
-#include "JniConstants.h" // Last to avoid problems with LOG redefinition.
-
namespace art {
static jclass VMClassLoader_findLoadedClass(JNIEnv* env, jclass, jobject javaLoader, jstring javaName) {
@@ -91,7 +89,7 @@
};
void register_java_lang_VMClassLoader(JNIEnv* env) {
- jniRegisterNativeMethods(env, "java/lang/VMClassLoader", gMethods, NELEM(gMethods));
+ REGISTER_NATIVE_METHODS("java/lang/VMClassLoader");
}
} // namespace art