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

Commit e81d085c authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Remove unused option MadviseRandomAccess." am: 2a6206c2 am:... 

Merge "Merge "Remove unused option MadviseRandomAccess." am: 2a6206c2 am: 7d32fad3 am: 691bb7c9 am: cdb1c1b7" into udc-d1-dev-plus-aosp
parents 48b7f7a2 b8526de3

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,