commit 683f3188c90c483a209e0867f16a1c2536129eb9
author Andreas Gampe <agampe@google.com> Tue Feb 19 22:19:28 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 19 22:19:28 2019 +0000
tree 6d977f570c077690716ec70582104328ca9b1c48
parent a2849b1aecab5fa9db4ad2185e46cb2f80620982
parent 142836515437bec4545d982387895190b8e5c678

Merge "Revert "dexopt: Fix target-sdk-version argument creation""

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 852aa79..3d7feb7 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -352,6 +352,8 @@
         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 @@
         AddArg(instruction_set_variant_arg);
         AddArg(instruction_set_features_arg);
 
+        AddRuntimeArg(boot_image);
         AddRuntimeArg(dex2oat_Xms_arg);
         AddRuntimeArg(dex2oat_Xmx_arg);