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

Commit 57b6391e authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

Merge "AndroidRuntime: pass odsign verification status to ART" am: 2d2d5467 

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

Change-Id: Ia566ae8c8ee8455180e6e365ae4f6b1d41826b8e
parents cfd0efc8 2d2d5467

core/jni/AndroidRuntime.cpp

+5 −0
Original line number Diff line number Diff line
@@ -744,6 +744,11 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
        //addOption("-verbose:jni");

    }



    const bool odsignVerificationSuccess = GetBoolProperty("odsign.verification.success", false);

    if (!odsignVerificationSuccess) {

        addOption("-Xdeny-art-apex-data-files");

    }



    property_get("dalvik.vm.execution-mode", propBuf, "");

    if (strcmp(propBuf, "int:portable") == 0) {

        executionMode = kEMIntPortable;