Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f9be4dc authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

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

am: 797f9509

Change-Id: I7c68b50736f9134fe26b243fc974fe24ca9975e4
parents a01fa3b2 797f9509

cmds/installd/dexopt.cpp

+7 −1
Original line number Diff line number Diff line
@@ -316,6 +316,11 @@ class RunDex2Oat : public ExecVHelper { 
        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 @@ class RunDex2Oat : public ExecVHelper { 
        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);