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

Commit 9b3a6c28 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AndroidRuntime: pass odsign verification status to ART" into sc-dev am: f5ee8cf3 

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

Change-Id: I53f13642a9ceb8fdd5ff26d170ab55eebb64db8e
parents 9063385a f5ee8cf3

core/jni/AndroidRuntime.cpp

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

        //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, "");

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

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

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

        executionMode = kEMIntPortable;

        executionMode = kEMIntPortable;