commit 0dae5763c4bea3772c3b97c919c933a4db04688c
author Brian Carlstrom <bdc@google.com> Thu May 09 19:02:38 2013 -0700
committer Brian Carlstrom <bdc@google.com> Thu May 09 19:06:38 2013 -0700
tree c71ec9175a55dce8c89befcc56db0454bc82e68c
parent fd6ac49042522cbed5db0c097114a62b5201f6af

Adapt dalvik to new libnativehelper

Change-Id: Id4707ea30c77d3760f1224fd9063c8c3f87c1ea7

vm/Android.mk

diff --git a/vm/Android.mk b/vm/Android.mk
index 774dde7..eb36c0f 100644
--- a/vm/Android.mk
+++ b/vm/Android.mk
@@ -109,7 +109,7 @@
     WITH_JIT := true
     include $(LOCAL_PATH)/Dvm.mk
 
-    LOCAL_SHARED_LIBRARIES += libcrypto-host libssl-host libicuuc-host libicui18n-host
+    LOCAL_SHARED_LIBRARIES += libnativehelper libcrypto-host libssl-host libicuuc-host libicui18n-host
 
     LOCAL_LDLIBS := -lpthread -ldl
     ifeq ($(HOST_OS),linux)

vm/Init.cpp

diff --git a/vm/Init.cpp b/vm/Init.cpp
index 11d884e..90d1d3a 100644
--- a/vm/Init.cpp
+++ b/vm/Init.cpp
@@ -33,6 +33,7 @@
 #include "test/Test.h"
 #include "mterp/Mterp.h"
 #include "Hash.h"
+#include "JniConstants.h"
 
 #if defined(WITH_JIT)
 #include "compiler/codegen/Optimizer.h"
@@ -1618,6 +1619,9 @@
     // Must set this before allowing JNI-based method registration.
     self->status = THREAD_NATIVE;
 
+    // First set up JniConstants, which is used by libcore.
+    JniConstants::init(pEnv);
+
     // Most JNI libraries can just use System.loadLibrary, but you can't
     // if you're the library that implements System.loadLibrary!
     loadJniLibrary("javacore");