commit 67a14f6584d6108c29b923ce6a77c0ed5cf347dc
author Roland Levillain <rpl@google.com> Wed Jan 23 15:59:50 2019 +0000
committer Roland Levillain <rpl@google.com> Wed Jan 23 18:15:14 2019 +0000
tree 1a0763d6ddada67c3e53abbc696715e46df1af1b
parent 94b41806834afe4ae281bc1ad43cc3353ddbe15e

Refactor paths to Android Runtime binaries in directory `cmds/installd/`.

Have `dexopt` and `otapreopt` use the same set of definitions.

Test: A/B OTA update test (asit/dexoptota/self_full).
Bug: 113373927
Bug: 120796514
Change-Id: I94e55a831c68b67cb81cfa91281b2feb0cc4b365

cmds/installd/otapreopt.cpp

diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp
index 05c8538..de7b249 100644
--- a/cmds/installd/otapreopt.cpp
+++ b/cmds/installd/otapreopt.cpp
@@ -438,7 +438,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(kDex2oatPath);
         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()));