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

Commit addebce2 authored by Orion Hodson's avatar Orion Hodson Committed by android-build-merger
Browse files

Merge "installd: add dex2oat cpu-set system properties" am: b05c6a56 

am: c66d78fa

Change-Id: I5de8c07e778d924dffd7671d9780baf1270671ad
parents 42a7389c c66d78fa

cmds/installd/dexopt.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -339,6 +339,10 @@ class RunDex2Oat : public ExecVHelper { 
                ? "dalvik.vm.dex2oat-threads"

                ? "dalvik.vm.dex2oat-threads"

                : "dalvik.vm.boot-dex2oat-threads";

                : "dalvik.vm.boot-dex2oat-threads";

        std::string dex2oat_threads_arg = MapPropertyToArg(threads_property, "-j%s");

        std::string dex2oat_threads_arg = MapPropertyToArg(threads_property, "-j%s");

        const char* cpu_set_property = post_bootcomplete

                ? "dalvik.vm.dex2oat-cpu-set"

                : "dalvik.vm.boot-dex2oat-cpu-set";

        std::string dex2oat_cpu_set_arg = MapPropertyToArg(cpu_set_property, "--cpu-set=%s");





        std::string bootclasspath;

        std::string bootclasspath;

        char* dex2oat_bootclasspath = getenv("DEX2OATBOOTCLASSPATH");

        char* dex2oat_bootclasspath = getenv("DEX2OATBOOTCLASSPATH");
@@ -518,6 +522,7 @@ class RunDex2Oat : public ExecVHelper { 
        AddArg(image_block_size_arg);

        AddArg(image_block_size_arg);

        AddArg(dex2oat_compiler_filter_arg);

        AddArg(dex2oat_compiler_filter_arg);

        AddArg(dex2oat_threads_arg);

        AddArg(dex2oat_threads_arg);

        AddArg(dex2oat_cpu_set_arg);

        AddArg(dex2oat_swap_fd);

        AddArg(dex2oat_swap_fd);

        AddArg(dex2oat_image_fd);

        AddArg(dex2oat_image_fd);

cmds/installd/otapreopt.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -480,6 +480,10 @@ private: 
                "-j",

                "-j",

                false,

                false,

                cmd);

                cmd);

        AddCompilerOptionFromSystemProperty("dalvik.vm.image-dex2oat-cpu-set",

                "--cpu-set=",

                false,

                cmd);

        AddCompilerOptionFromSystemProperty(

        AddCompilerOptionFromSystemProperty(

                StringPrintf("dalvik.vm.isa.%s.variant", isa).c_str(),

                StringPrintf("dalvik.vm.isa.%s.variant", isa).c_str(),

                "--instruction-set-variant=",

                "--instruction-set-variant=",