Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d73e227 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "Remove libdvm dependency"

parents d4fed90d 9f8203a1

core/jni/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ LOCAL_SHARED_LIBRARIES := \ 
	libcamera_client \

	libskia \

	libsqlite \

	libdvm \

	libEGL \

	libGLESv1_CM \

	libGLESv2 \

core/jni/AndroidRuntime.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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;