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

Commit 9dd3abd5 authored by Vladimir Marko's avatar Vladimir Marko Committed by Android (Google) Code Review
Browse files

Merge "Pass updatable BCP packages to dex2oat." into rvc-dev

parents 24a3146f 49cbd510

cmds/installd/dexopt.cpp

+9 −0
Original line number Original line Diff line number Diff line
@@ -374,6 +374,14 @@ class RunDex2Oat : public ExecVHelper { 
        bool skip_compilation = vold_decrypt == "trigger_restart_min_framework" ||

        bool skip_compilation = vold_decrypt == "trigger_restart_min_framework" ||

                                vold_decrypt == "1";

                                vold_decrypt == "1";





        std::string updatable_bcp_packages =

            MapPropertyToArg("dalvik.vm.dex2oat-updatable-bcp-packages-file",

                             "--updatable-bcp-packages-file=%s");

        if (updatable_bcp_packages.empty()) {

          // Make dex2oat fail by providing non-existent file name.

          updatable_bcp_packages = "--updatable-bcp-packages-file=/nonx/updatable-bcp-packages.txt";

        }



        std::string resolve_startup_string_arg =

        std::string resolve_startup_string_arg =

                MapPropertyToArg("persist.device_config.runtime.dex2oat_resolve_startup_strings",

                MapPropertyToArg("persist.device_config.runtime.dex2oat_resolve_startup_strings",

                                 "--resolve-startup-const-strings=%s");

                                 "--resolve-startup-const-strings=%s");
@@ -520,6 +528,7 @@ class RunDex2Oat : public ExecVHelper { 
        AddRuntimeArg(dex2oat_Xms_arg);

        AddRuntimeArg(dex2oat_Xms_arg);

        AddRuntimeArg(dex2oat_Xmx_arg);

        AddRuntimeArg(dex2oat_Xmx_arg);





        AddArg(updatable_bcp_packages);

        AddArg(resolve_startup_string_arg);

        AddArg(resolve_startup_string_arg);

        AddArg(image_block_size_arg);

        AddArg(image_block_size_arg);

        AddArg(dex2oat_compiler_filter_arg);

        AddArg(dex2oat_compiler_filter_arg);