Merge "AndroidRuntime: pass odsign verification status to ART" am: 2d2d5467b5 am: 57b6391e7e am: 3e5b9d4ab7

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

Change-Id: I67defc3a81515058fde9f72b75e0712712db0fe1
This commit is contained in:
Orion Hodson
2021-07-02 11:03:27 +00:00
committed by Automerger Merge Worker

View File

@@ -753,6 +753,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;