commit 5880c037a38c2a404b16d542740c213fe5a1932c
author Mathieu Chartier <mathieuc@google.com> Wed Nov 28 19:15:41 2018 -0800
committer Mathieu Chartier <mathieuc@google.com> Wed Nov 28 20:05:21 2018 -0800
tree 93b46e8889009563a96a61a4786a08dbdb3f2bbc
parent d2be1a96be425dc412117193af412fedcadd0ce6

Add dalvik.vm.dex2oat-max-image-block-size property

Maps to --max-image-block-size dex2oat option.

Bug: 116052292
Test: manual

Change-Id: I489ada8b4315810cd7ef06653aeca64fcf74b5e2

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index aad9939..25e5247 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -313,9 +313,14 @@
         bool skip_compilation = vold_decrypt == "trigger_restart_min_framework" ||
                                 vold_decrypt == "1";
 
-        const std::string resolve_startup_string_arg  =
+        const std::string resolve_startup_string_arg =
                 MapPropertyToArg("dalvik.vm.dex2oat-resolve-startup-strings",
                                  "--resolve-startup-const-strings=%s");
+
+        const std::string image_block_size_arg =
+                MapPropertyToArg("dalvik.vm.dex2oat-max-image-block-size",
+                                 "--max-image-block-size=%s");
+
         const bool generate_debug_info = GetBoolProperty("debug.generate-debug-info", false);
 
         std::string image_format_arg;
@@ -430,6 +435,7 @@
         AddRuntimeArg(dex2oat_Xmx_arg);
 
         AddArg(resolve_startup_string_arg);
+        AddArg(image_block_size_arg);
         AddArg(dex2oat_compiler_filter_arg);
         AddArg(dex2oat_threads_arg);
         AddArg(dex2oat_swap_fd);