From 3a77febd0b57dcaceee2bb13b4bccddffb25ffc8 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Mon, 10 Dec 2018 23:13:49 +0000 Subject: 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/dexopt.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'cmds/installd/dexopt.cpp') diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp index 645e211233..25e5247c68 100644 --- a/cmds/installd/dexopt.cpp +++ b/cmds/installd/dexopt.cpp @@ -332,8 +332,8 @@ class RunDex2Oat : public ExecVHelper { 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 = "/apex/com.android.runtime/bin/dex2oat"; - constexpr const char* kDex2oatDebugPath = "/apex/com.android.runtime/bin/dex2oatd"; + const char* dex2oat_bin = "/system/bin/dex2oat"; + constexpr const char* kDex2oatDebugPath = "/system/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() || @@ -662,9 +662,7 @@ class RunProfman : public ExecVHelper { const std::vector& dex_locations, bool copy_and_update) { const char* profman_bin = - is_debug_runtime() - ? "/apex/com.android.runtime/bin/profmand" - : "/apex/com.android.runtime/bin/profman"; + is_debug_runtime() ? "/system/bin/profmand" : "/system/bin/profman"; if (copy_and_update) { CHECK_EQ(1u, profile_fds.size()); @@ -1466,9 +1464,9 @@ class RunDexoptAnalyzer : public ExecVHelper { const char* class_loader_context) { CHECK_GE(zip_fd, 0); const char* dexoptanalyzer_bin = - is_debug_runtime() - ? "/apex/com.android.runtime/bin/dexoptanalyzerd" - : "/apex/com.android.runtime/bin/dexoptanalyzer"; + is_debug_runtime() + ? "/system/bin/dexoptanalyzerd" + : "/system/bin/dexoptanalyzer"; std::string dex_file_arg = "--dex-file=" + dex_file; std::string oat_fd_arg = "--oat-fd=" + std::to_string(oat_fd); -- cgit v1.2.3-59-g8ed1b