commit b8f50cd4b82e75ff025b87581cc6e1e56f7f676f
author Roland Levillain <rpl@google.com> Fri Nov 02 18:43:17 2018 +0000
committer Roland Levillain <rpl@google.com> Mon Dec 10 14:08:53 2018 +0000
tree 840d7f129b93ea9212f57bc1387c7bf5a3d647c0
parent 117dd2fdea9fdf6ae90a5ad8832b4aa7bcfa52da

Have installd use ART binaries from the Android Runtime APEX.

Test: Device boot test (with Android Runtime APEX).
Bug: 113373927
Change-Id: I79652a3b3fbdd5761cf81be56c524cce0dab2ca5

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()));