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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753263 Change-Id: Ia566ae8c8ee8455180e6e365ae4f6b1d41826b8e
2021-07-02 10:32:54 +00:00
parent cfd0efc88b 2d2d5467b5
commit 57b6391e7e
1 changed files with 5 additions and 0 deletions
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -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;