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

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

Change-Id: I53f13642a9ceb8fdd5ff26d170ab55eebb64db8e
This commit is contained in:
TreeHugger Robot
2021-07-02 17:49:24 +00:00
committed by Automerger Merge Worker

View File

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