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

Commit 007087cc authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Add a dalvik.vm.boot-image option for zygote and installd." am: a2849b1a 

am: a800ad6e

Change-Id: I8efd35438c50f29cff1420b1963ba641a7fcead9
parents 448e7e49 a800ad6e

cmds/installd/dexopt.cpp

+3 −0
Original line number Diff line number Diff line
@@ -352,6 +352,8 @@ class RunDex2Oat : public ExecVHelper { 
        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 @@ class RunDex2Oat : public ExecVHelper { 
        AddArg(instruction_set_variant_arg);

        AddArg(instruction_set_features_arg);



        AddRuntimeArg(boot_image);

        AddRuntimeArg(dex2oat_Xms_arg);

        AddRuntimeArg(dex2oat_Xmx_arg);