commit 3a77febd0b57dcaceee2bb13b4bccddffb25ffc8
author Andreas Gampe <agampe@google.com> Mon Dec 10 23:13:49 2018 +0000
committer Andreas Gampe <agampe@google.com> Mon Dec 10 23:18:18 2018 +0000
tree 754651ea621da6348bce7332449549272ed870d9
parent b8f50cd4b82e75ff025b87581cc6e1e56f7f676f

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

This reverts commit b8f50cd4b82e75ff025b87581cc6e1e56f7f676f.

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

Bug: 113373927
Bug: 120796514
Change-Id: I855acd8ba084eea31ddb2ef3ceb4425a35986a34

cmds/installd/otapreopt.cpp

diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp
index d161407..b2e7047 100644
--- a/cmds/installd/otapreopt.cpp
+++ b/cmds/installd/otapreopt.cpp
@@ -440,7 +440,7 @@
                           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()));