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

Commit a4980435 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add flag-guarded disabling of default .art file madvise" into main am:... 

Merge "Add flag-guarded disabling of default .art file madvise" into main am: 8e731f05 am: 2a871cb6

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



Change-Id: Idd9e8b9da66af2e9f75892bd995bf9f5c49ed8e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 613b67fa 2a871cb6

core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ cc_library_shared_for_libandroid_runtime { 
            ],



            static_libs: [

                "android.os.flags-aconfig-cc",

                "libasync_safe",

                "libbinderthreadstateutils",

                "libdmabufinfo",

core/jni/AndroidRuntime.cpp

+8 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <android-base/parsebool.h>

#include <android-base/properties.h>

#include <android/graphics/jni_runtime.h>

#include <android_os.h>

#include <android_runtime/AndroidRuntime.h>

#include <assert.h>

#include <binder/IBinder.h>
@@ -893,9 +894,13 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
                       madviseWillNeedFileSizeOdex,

                       "-XMadviseWillNeedOdexFileSize:");



    parseRuntimeOption("dalvik.vm.madvise.artfile.size",

                       madviseWillNeedFileSizeArt,

                       "-XMadviseWillNeedArtFileSize:");

    // Historically, dalvik.vm.madvise.artfile.size was set to UINT_MAX by default. With the

    // disable_madvise_art_default flag rollout, we use this default only when the flag is disabled.

    // TODO(b/382110550): Remove this property/flag entirely after validating and ramping.

    const char* madvise_artfile_size_default =

            android::os::disable_madvise_artfile_default() ? "" : "4294967295";

    parseRuntimeOption("dalvik.vm.madvise.artfile.size", madviseWillNeedFileSizeArt,

                       "-XMadviseWillNeedArtFileSize:", madvise_artfile_size_default);



    /*

     * Profile related options.