From 8b3fa97c03d3099dac91e715aeacd4687334f986 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 14 Feb 2019 15:57:47 +0000 Subject: Add a dalvik.vm.boot-image option for zygote and installd. To experiment with a non-fully AOT'ed boot image. Bug: 119800099 Test: adb shell setprop dalvik.vm.boot-image "/system/framework/boot.art" Change-Id: I7c5bb0bf38ffc988734e691dff90866aead3a5b7 --- cmds/installd/dexopt.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp index a6399510b6..b14ae1ba59 100644 --- a/cmds/installd/dexopt.cpp +++ b/cmds/installd/dexopt.cpp @@ -352,6 +352,8 @@ class RunDex2Oat : public ExecVHelper { bool generate_minidebug_info = kEnableMinidebugInfo && GetBoolProperty(kMinidebugInfoSystemProperty, kMinidebugInfoSystemPropertyDefault); + std::string boot_image = MapPropertyToArg("dalvik.vm.boot-image", "-Ximage:%s"); + // clang FORTIFY doesn't let us use strlen in constant array bounds, so we // use arraysize instead. std::string zip_fd_arg = StringPrintf("--zip-fd=%d", zip_fd); @@ -437,6 +439,7 @@ class RunDex2Oat : public ExecVHelper { AddArg(instruction_set_variant_arg); AddArg(instruction_set_features_arg); + AddRuntimeArg(boot_image); AddRuntimeArg(dex2oat_Xms_arg); AddRuntimeArg(dex2oat_Xmx_arg); -- cgit v1.2.3-59-g8ed1b