commit 370222c120cc2bdcbf77860f5ba83a501a4d2dfb
author Roland Levillain <rpl@google.com> Wed Dec 12 15:06:16 2018 +0000
committer Roland Levillain <rpl@google.com> Tue Jan 22 18:28:16 2019 +0000
tree 476d41bdbcc315b01971f722861983936f4db5b9
parent c19c604ba7707294a1751c0d2339c369ec305b32

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

This reverts commit 3a77febd0b57dcaceee2bb13b4bccddffb25ffc8.

Test: Device boot test (with Android Runtime APEX).
Test: A/B OTA update test (asit/dexoptota/self_full).
Bug: 113373927
Bug: 120796514
Change-Id: Ib22f91b5f8916f13b31bcd630600a86b9d86e25d

cmds/installd/otapreopt.cpp

diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp
index b2e7047..d161407 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("/system/bin/dex2oat");
+        cmd.push_back("/apex/com.android.runtime/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()));