summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-06-19 13:49:36 -0700
committerBrian Carlstrom <bdc@google.com>2013-06-20 16:34:45 -0700
commit9f8203a159d46124a0907a0d9500e599533beed3 (patch)
treeca7c3ebbe909f266d72ecaaaee86b9a9f67316bf /core/jni
parent8e1af51787983808b5181de9d17739810e943e1a (diff)
downloadframeworks_base-9f8203a159d46124a0907a0d9500e599533beed3.zip
frameworks_base-9f8203a159d46124a0907a0d9500e599533beed3.tar.gz
frameworks_base-9f8203a159d46124a0907a0d9500e599533beed3.tar.bz2
Remove libdvm dependency
Change-Id: I7d37db4e72e9435ecd514340cf61a051dc272f04
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/Android.mk1
-rw-r--r--core/jni/AndroidRuntime.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 188941b..5e1090f 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -193,7 +193,6 @@ LOCAL_SHARED_LIBRARIES := \
libcamera_client \
libskia \
libsqlite \
- libdvm \
libEGL \
libGLESv1_CM \
libGLESv2 \
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index de32e44..0158bf5 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -33,6 +33,7 @@
#include "jni.h"
#include "JNIHelp.h"
+#include "JniInvocation.h"
#include "android_util_Binder.h"
#include <stdio.h>
@@ -840,6 +841,8 @@ void AndroidRuntime::start(const char* className, const char* options)
//ALOGD("Found LD_ASSUME_KERNEL='%s'\n", kernelHack);
/* start the virtual machine */
+ JniInvocation jni_invocation;
+ jni_invocation.Init(NULL);
JNIEnv* env;
if (startVm(&mJavaVM, &env) != 0) {
return;