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_reflect_Array.cc b/src/native/java_lang_reflect_Array.cc
index 1c86aac..ea635d3 100644
--- a/src/native/java_lang_reflect_Array.cc
+++ b/src/native/java_lang_reflect_Array.cc
@@ -14,13 +14,11 @@
* limitations under the License.
*/
-#include "jni_internal.h"
#include "class_linker.h"
+#include "jni_internal.h"
#include "object.h"
#include "object_utils.h"
-#include "JniConstants.h" // Last to avoid problems with LOG redefinition.
-
namespace art {
// Recursively create an array with multiple dimensions. Elements may be
@@ -150,7 +148,7 @@
};
void register_java_lang_reflect_Array(JNIEnv* env) {
- jniRegisterNativeMethods(env, "java/lang/reflect/Array", gMethods, NELEM(gMethods));
+ REGISTER_NATIVE_METHODS("java/lang/reflect/Array");
}
} // namespace art