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

Commit f2bcd619 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

Change-Id: Icbdf60640f0a1b5995ad09eba0bee6ed81b50c4a
parents becdd58d 80e697a2
Loading
Loading
Loading
Loading
+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, "");