commit eac766769e3114a078c188ea26776a81f0edb3cf
author Elliott Hughes <enh@google.com> Thu May 24 21:56:51 2012 -0700
committer Elliott Hughes <enh@google.com> Fri May 25 12:04:43 2012 -0700
tree 4b9b8dfc89725173431817baba4455c013e40577
parent 3f9ace8d90bfc48c8d7bf35af66de8ce8238de7f

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

src/native/java_lang_reflect_Proxy.cc

diff --git a/src/native/java_lang_reflect_Proxy.cc b/src/native/java_lang_reflect_Proxy.cc
index bac20b0..eca6c32 100644
--- a/src/native/java_lang_reflect_Proxy.cc
+++ b/src/native/java_lang_reflect_Proxy.cc
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
+#include "class_linker.h"
 #include "jni_internal.h"
 #include "object.h"
-#include "class_linker.h"
-
-#include "JniConstants.h" // Last to avoid problems with LOG redefinition.
 
 namespace art {
 
@@ -40,7 +38,7 @@
 };
 
 void register_java_lang_reflect_Proxy(JNIEnv* env) {
-  jniRegisterNativeMethods(env, "java/lang/reflect/Proxy", gMethods, NELEM(gMethods));
+  REGISTER_NATIVE_METHODS("java/lang/reflect/Proxy");
 }
 
 }  // namespace art