commit 79eeb98d74527d6c12f2b864bdb43bbcf5b0c05a
author Nicolas Geoffray <ngeoffray@google.com> Thu Feb 14 15:55:20 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Feb 14 15:56:15 2019 +0000
tree 6deafe0154759262cf6a3fa70ec7fb4079c5ccde
parent 8a99661282dbda439b7e927e68778bfd996f058b

Add a dalvik.vm.boot-image option for zygote and installd.

Bug: 119800099
Test: adb shell setprop dalvik.vm.boot-image "/system/framework/boot.art"

Change-Id: Iccafc56b5c95e848efca2699e16306a26d856478

core/jni/AndroidRuntime.cpp

diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index b94ac9c..565fa6f 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -651,6 +651,11 @@
     char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX];
     std::string fingerprintBuf;
     char jdwpProviderBuf[sizeof("-XjdwpProvider:") - 1 + PROPERTY_VALUE_MAX];
+    char bootImageBuf[sizeof("-Ximage:") - 1 + PROPERTY_VALUE_MAX];
+
+    if (parseRuntimeOption("dalvik.vm.boot-image", bootImageBuf, "-Ximage:")) {
+        ALOGI("Boot image: '%s'\n", bootImageBuf);
+    }
 
     bool checkJni = false;
     property_get("dalvik.vm.checkjni", propBuf, "");