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/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 32c1313..2112fda 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -332,8 +332,8 @@
             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 = "/system/bin/dex2oat";
-        constexpr const char* kDex2oatDebugPath = "/system/bin/dex2oatd";
+        const char* dex2oat_bin = "/apex/com.android.runtime/bin/dex2oat";
+        constexpr const char* kDex2oatDebugPath = "/apex/com.android.runtime/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() ||
@@ -663,7 +663,9 @@
                   bool copy_and_update,
                   bool store_aggregation_counters) {
         const char* profman_bin =
-                is_debug_runtime() ? "/system/bin/profmand" : "/system/bin/profman";
+            is_debug_runtime()
+                ? "/apex/com.android.runtime/bin/profmand"
+                : "/apex/com.android.runtime/bin/profman";
 
         if (copy_and_update) {
             CHECK_EQ(1u, profile_fds.size());
@@ -1479,9 +1481,9 @@
                     const char* class_loader_context) {
         CHECK_GE(zip_fd, 0);
         const char* dexoptanalyzer_bin =
-                is_debug_runtime()
-                        ? "/system/bin/dexoptanalyzerd"
-                        : "/system/bin/dexoptanalyzer";
+            is_debug_runtime()
+                ? "/apex/com.android.runtime/bin/dexoptanalyzerd"
+                : "/apex/com.android.runtime/bin/dexoptanalyzer";
 
         std::string dex_file_arg = "--dex-file=" + dex_file;
         std::string oat_fd_arg = "--oat-fd=" + std::to_string(oat_fd);