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

Commit 6d335970 authored by Dmitrii Ishcheikin's avatar Dmitrii Ishcheikin Committed by Automerger Merge Worker
Browse files

Merge "Split dirty-image-objects file between art and framework" into main am:... 

Merge "Split dirty-image-objects file between art and framework" into main am: 27c724e2 am: 169d3260

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



Change-Id: I2f7bc393974a27825df69d82ad786d5f94057df9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2afb8e4a 169d3260

config/dirty-image-objects

+1427 −1702

File changed.

Preview size limit exceeded, changes collapsed.

core/jni/AndroidRuntime.cpp

+12 −4
Original line number Diff line number Diff line
@@ -1024,10 +1024,18 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
    parseCompilerOption("dalvik.vm.image-dex2oat-filter", dex2oatImageCompilerFilterBuf,

                        "--compiler-filter=", "-Ximage-compiler-option");



    // If there is a dirty-image-objects file, push it.

    if (hasFile("/system/etc/dirty-image-objects")) {

    // If there are dirty-image-objects files, push them.

    const char* dirty_image_objects_options[] = {

            "--dirty-image-objects=/apex/com.android.art/etc/dirty-image-objects",

            "--dirty-image-objects=/system/etc/dirty-image-objects",

    };

    for (const char* option : dirty_image_objects_options) {

        // Get the file path by finding the first '/' and check if

        // this file exists.

        if (hasFile(strchr(option, '/'))) {

            addOption("-Ximage-compiler-option");

        addOption("--dirty-image-objects=/system/etc/dirty-image-objects");

            addOption(option);

        }

    }



    parseCompilerOption("dalvik.vm.image-dex2oat-threads", dex2oatThreadsImageBuf, "-j",