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

Commit bda2cb3b authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Add a dalvik.vm.boot-image option for zygote and installd." am: 80e697a2 

am: f2bcd619

Change-Id: If5c1bbd614f5c3758f636f6a30ac93e0b64bb01d
parents 598b2497 f2bcd619

core/jni/AndroidRuntime.cpp

+5 −0
Original line number Diff line number Diff line
@@ -651,6 +651,11 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
    char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX];

    std::string fingerprintBuf;

    char jdwpProviderBuf[sizeof("-XjdwpProvider:") - 1 + PROPERTY_VALUE_MAX];

    char bootImageBuf[sizeof("-Ximage:") - 1 + PROPERTY_VALUE_MAX];



    if (parseRuntimeOption("dalvik.vm.boot-image", bootImageBuf, "-Ximage:")) {

        ALOGI("Boot image: '%s'\n", bootImageBuf);

    }



    bool checkJni = false;

    property_get("dalvik.vm.checkjni", propBuf, "");