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

Commit 3a77febd authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Revert "Have installd use ART binaries from the Android Runtime APEX." 

This reverts commit b8f50cd4.

Reason for revert: Breaks A/B OTA for marlin.

Bug: 113373927
Bug: 120796514
Change-Id: I855acd8ba084eea31ddb2ef3ceb4425a35986a34
parent b8f50cd4

cmds/installd/dexopt.cpp

+6 −8
Original line number Diff line number Diff line
@@ -332,8 +332,8 @@ class RunDex2Oat : public ExecVHelper { 
            MapPropertyToArg("dalvik.vm.dex2oat-very-large", "--very-large-app-threshold=%s");



        // If the runtime was requested to use libartd.so, we'll run dex2oatd, otherwise dex2oat.

        const char* dex2oat_bin = "/apex/com.android.runtime/bin/dex2oat";

        constexpr const char* kDex2oatDebugPath = "/apex/com.android.runtime/bin/dex2oatd";

        const char* dex2oat_bin = "/system/bin/dex2oat";

        constexpr const char* kDex2oatDebugPath = "/system/bin/dex2oatd";

        // Do not use dex2oatd for release candidates (give dex2oat more soak time).

        bool is_release = android::base::GetProperty("ro.build.version.codename", "") == "REL";

        if (is_debug_runtime() ||
@@ -662,9 +662,7 @@ class RunProfman : public ExecVHelper { 
                  const std::vector<std::string>& dex_locations,

                  bool copy_and_update) {

        const char* profman_bin =

            is_debug_runtime()

                ? "/apex/com.android.runtime/bin/profmand"

                : "/apex/com.android.runtime/bin/profman";

                is_debug_runtime() ? "/system/bin/profmand" : "/system/bin/profman";



        if (copy_and_update) {

            CHECK_EQ(1u, profile_fds.size());
@@ -1467,8 +1465,8 @@ class RunDexoptAnalyzer : public ExecVHelper { 
        CHECK_GE(zip_fd, 0);

        const char* dexoptanalyzer_bin =

                is_debug_runtime()

                ? "/apex/com.android.runtime/bin/dexoptanalyzerd"

                : "/apex/com.android.runtime/bin/dexoptanalyzer";

                        ? "/system/bin/dexoptanalyzerd"

                        : "/system/bin/dexoptanalyzer";



        std::string dex_file_arg = "--dex-file=" + dex_file;

        std::string oat_fd_arg = "--oat-fd=" + std::to_string(oat_fd);

cmds/installd/otapreopt.cpp

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ private: 
                          const char* isa) const {

        // This needs to be kept in sync with ART, see art/runtime/gc/space/image_space.cc.

        std::vector<std::string> cmd;

        cmd.push_back("/apex/com.android.runtime/bin/dex2oat");

        cmd.push_back("/system/bin/dex2oat");

        cmd.push_back(StringPrintf("--image=%s", art_path.c_str()));

        for (const std::string& boot_part : Split(boot_cp, ":")) {

            cmd.push_back(StringPrintf("--dex-file=%s", boot_part.c_str()));