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

Commit 96fab6e3 authored by Mathieu Chartier's avatar Mathieu Chartier
Browse files

Remove support for image classes 

--image-classes is no longer supported by ART.

Test: make
Change-Id: I2d2a26594ab61a59237db730dd402ab9e53ecfab
parent 73b4106d

core/jni/AndroidRuntime.cpp

+9 −13
Original line number Diff line number Diff line
@@ -886,21 +886,17 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
        addOption("-Ximage-compiler-option");

        addOption("--compiler-filter=speed-profile");

    } else {

        // Make sure there is a preloaded-classes file.

        if (!hasFile("/system/etc/preloaded-classes")) {

            ALOGE("Missing preloaded-classes file, /system/etc/preloaded-classes not found: %s\n",

        ALOGE("Missing boot-image.prof file, /system/etc/boot-image.prof not found: %s\n",

              strerror(errno));

        return -1;

    }

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

        addOption("--image-classes=/system/etc/preloaded-classes");





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

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

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

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

    }

    }



    property_get("dalvik.vm.image-dex2oat-flags", dex2oatImageFlagsBuf, "");

    parseExtraOpts(dex2oatImageFlagsBuf, "-Ximage-compiler-option");