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

Commit 6eecd0c0 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Automerger Merge Worker
Browse files

Merge "Remove unused option MadviseRandomAccess." into udc-dev am: 39f880ea 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23105719



Change-Id: I5d180c413c20f8ce4faacb4746c9bf077285f8be
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5e2b34e8 39f880ea

core/jni/AndroidRuntime.cpp

+2 −9
Original line number Diff line number Diff line
@@ -652,9 +652,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
    char saveResolvedClassesDelayMsOptsBuf[

            sizeof("-Xps-save-resolved-classes-delay-ms:")-1 + PROPERTY_VALUE_MAX];

    char profileMinSavePeriodOptsBuf[sizeof("-Xps-min-save-period-ms:")-1 + PROPERTY_VALUE_MAX];

    char profileMinFirstSaveOptsBuf[

            sizeof("-Xps-min-first-save-ms:")-1 + PROPERTY_VALUE_MAX];

    char madviseRandomOptsBuf[sizeof("-XX:MadviseRandomAccess:")-1 + PROPERTY_VALUE_MAX];

    char profileMinFirstSaveOptsBuf[sizeof("-Xps-min-first-save-ms:") - 1 + PROPERTY_VALUE_MAX];

    char madviseWillNeedFileSizeVdex[

            sizeof("-XMadviseWillNeedVdexFileSize:")-1 + PROPERTY_VALUE_MAX];

    char madviseWillNeedFileSizeOdex[
@@ -866,13 +864,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
                       jitprithreadweightOptBuf,

                       "-Xjitprithreadweight:");



    parseRuntimeOption("dalvik.vm.jittransitionweight",

                       jittransitionweightOptBuf,

    parseRuntimeOption("dalvik.vm.jittransitionweight", jittransitionweightOptBuf,

                       "-Xjittransitionweight:");

    /*

     * Madvise related options.

     */

    parseRuntimeOption("dalvik.vm.madvise-random", madviseRandomOptsBuf, "-XX:MadviseRandomAccess:");



    /*

     * Use default platform configuration as limits for madvising,